diff --git a/git/test/lib/helper.py b/git/test/lib/helper.py
index 3a60d116c..5790a8589 100644
--- a/git/test/lib/helper.py
+++ b/git/test/lib/helper.py
@@ -227,7 +227,7 @@ class TestBase(TestCase):
 	"""
 	
 	@classmethod
-	def setUpAll(cls):
+	def setUpClass(cls):
 		"""
 		Dynamically add a read-only repository to our actual type. This way 
 		each test type has its own repository
diff --git a/git/test/performance/lib.py b/git/test/performance/lib.py
index d0727b600..a8acb9fde 100644
--- a/git/test/performance/lib.py
+++ b/git/test/performance/lib.py
@@ -51,8 +51,8 @@ class TestBigRepoR(TestBase):
 	#} END invariants 
 	
 	@classmethod
-	def setUpAll(cls):
-		super(TestBigRepoR, cls).setUpAll()
+	def setUpClass(cls):
+		super(TestBigRepoR, cls).setUpClass()
 		repo_path = resolve_or_fail(k_env_git_repo)
 		cls.gitrorepo = Repo(repo_path, odbt=GitCmdObjectDB)
 		cls.puregitrorepo = Repo(repo_path, odbt=GitDB)
@@ -64,15 +64,15 @@ class TestBigRepoRW(TestBigRepoR):
 	Provides ``self.gitrwrepo`` and ``self.puregitrwrepo``"""
 	
 	@classmethod
-	def setUpAll(cls):
-		super(TestBigRepoRW, cls).setUpAll()
+	def setUpClass(cls):
+		super(TestBigRepoRW, cls).setUpClass()
 		dirname = tempfile.mktemp()
 		os.mkdir(dirname)
 		cls.gitrwrepo = cls.gitrorepo.clone(dirname, shared=True, bare=True, odbt=GitCmdObjectDB)
 		cls.puregitrwrepo = Repo(dirname, odbt=GitDB)
 	
 	@classmethod
-	def tearDownAll(cls):
+	def tearDownClass(cls):
 		shutil.rmtree(cls.gitrwrepo.working_dir)
 		
 #} END base classes
diff --git a/git/test/test_git.py b/git/test/test_git.py
index 2d38e0a80..2ec1d89ba 100644
--- a/git/test/test_git.py
+++ b/git/test/test_git.py
@@ -19,8 +19,8 @@
 class TestGit(TestBase):
 	
 	@classmethod
-	def setUpAll(cls):
-		super(TestGit, cls).setUpAll()
+	def setUpClass(cls):
+		super(TestGit, cls).setUpClass()
 		cls.git = Git(cls.rorepo.working_dir)
 
 	@patch_object(Git, 'execute')