diff --git a/testing_support/fake_repos.py b/testing_support/fake_repos.py
index c5e509133..43a4735fb 100755
--- a/testing_support/fake_repos.py
+++ b/testing_support/fake_repos.py
@@ -242,7 +242,7 @@ class FakeReposBase(object):
       logging.debug('Killing svnserve pid %s' % self.svnserve.pid)
       try:
         self.svnserve.kill()
-      except OSError, e:
+      except OSError as e:
         if e.errno != errno.ESRCH:   # no such process
           raise
       wait_for_port_to_free(self.host, self.svn_port)
@@ -267,7 +267,11 @@ class FakeReposBase(object):
         pid = int(self.git_pid_file.read())
         self.git_pid_file.close()
         logging.debug('Killing git daemon pid %s' % pid)
-        subprocess2.kill_pid(pid)
+        try:
+          subprocess2.kill_pid(pid)
+        except OSError as e:
+          if e.errno != errno.ESRCH:  # no such process
+            raise
         self.git_pid_file = None
       wait_for_port_to_free(self.host, self.git_port)
       self.git_port = None
diff --git a/tests/checkout_test.py b/tests/checkout_test.py
index cfdeac395..57c9a5d5c 100755
--- a/tests/checkout_test.py
+++ b/tests/checkout_test.py
@@ -446,23 +446,23 @@ class GitCheckout(GitBaseTest):
       commit_user=self.usr,
       post_processors=post_processors)
 
-  def disabled_testAll(self):
+  def testAll(self):
     root = os.path.join(self.root_dir, self.name)
     self._check_base(self._get_co(None), root, None)
 
-  def disabled_testException(self):
+  def testException(self):
     self._check_exception(
         self._get_co(None),
         'While running git apply --index -p1;\n  fatal: corrupt patch at line '
         '12\n')
 
-  def disabled_testProcess(self):
+  def testProcess(self):
     self._test_process(self._get_co)
 
   def _testPrepare(self):
     self._test_prepare(self._get_co(None))
 
-  def disabled_testMove(self):
+  def testMove(self):
     co = self._get_co(None)
     self._check_move(co)
     out = subprocess2.check_output(