diff --git a/stgit/t/test-lib.sh b/stgit/t/test-lib.sh
index 2d12f1b..cf5735f 100644
--- a/stgit/t/test-lib.sh
+++ b/stgit/t/test-lib.sh
@@ -20,11 +20,11 @@ unset COMMIT_AUTHOR_NAME
 unset EMAIL
 unset GIT_ALTERNATE_OBJECT_DIRECTORIES
 unset GIT_AUTHOR_DATE
-#GIT_AUTHOR_EMAIL=author@example.com
-#GIT_AUTHOR_NAME='A U Thor'
+GIT_AUTHOR_EMAIL=author@example.com
+GIT_AUTHOR_NAME='A U Thor'
 unset GIT_COMMITTER_DATE
-#GIT_COMMITTER_EMAIL=committer@example.com
-#GIT_COMMITTER_NAME='C O Mitter'
+GIT_COMMITTER_EMAIL=committer@example.com
+GIT_COMMITTER_NAME='C O Mitter'
 unset GIT_DIFF_OPTS
 unset GIT_DIR
 unset GIT_EXTERNAL_DIFF
@@ -226,12 +226,12 @@ test_create_repo () {
 	repo="$1"
 	mkdir "$repo"
 	cd "$repo" || error "Cannot setup test environment"
-	git-init >/dev/null 2>&1 ||
-	error "cannot run git-init -- have you installed git-core?"
+	git init >/dev/null 2>&1 ||
+	error "cannot run git init -- have you installed git-core?"
 	mkdir .git/info
 	echo "empty start" |
-	git-commit-tree `git-write-tree` >.git/refs/heads/master 2>&4 ||
-	error "cannot run git-commit -- is your git-core functioning?"
+	git commit-tree `git write-tree` >.git/refs/heads/master 2>&4 ||
+	error "cannot run git commit -- is your git-core functioning?"
 	cd "$owd"
 }
 
diff --git a/stgit/t/t1200-push-modified.sh b/stgit/t/t1200-push-modified.sh
index cfec696..647c200 100755
--- a/stgit/t/t1200-push-modified.sh
+++ b/stgit/t/t1200-push-modified.sh
@@ -35,8 +35,8 @@ test_expect_success \
     'Port those patches to orig tree' '
     (
         cd foo &&
-        GIT_DIR=../bar/.git git-format-patch --stdout \
-          $(cd ../bar && stg id base@master)..HEAD | git-am -3 -k
+        GIT_DIR=../bar/.git git format-patch --stdout \
+          $(cd ../bar && stg id base@master)..HEAD | git am -3 -k
     )
 '
 
diff --git a/stgit/t/t1201-pull-trailing.sh b/stgit/t/t1201-pull-trailing.sh
index 46d9f82..805e805 100755
--- a/stgit/t/t1201-pull-trailing.sh
+++ b/stgit/t/t1201-pull-trailing.sh
@@ -29,9 +29,9 @@ test_expect_success \
 test_expect_success \
     'Port those patches to orig tree' \
     '(cd foo &&
-      GIT_DIR=../bar/.git git-format-patch --stdout \
+      GIT_DIR=../bar/.git git format-patch --stdout \
           $(cd ../bar && stg id base@master)..HEAD |
-      git-am -3 -k
+      git am -3 -k
      )
     '
 
diff --git a/stgit/config.py b/stgit/config.py
index efce097..dbca5fb 100644
--- a/stgit/stgit/config.py
+++ b/stgit/stgit/config.py
@@ -73,14 +73,14 @@ class GitConfig:
         """Rename a section in the config file. Silently do nothing if
         the section doesn't exist."""
         Run('git', 'config', '--rename-section', from_name, to_name
-            ).returns([0, 1]).run()
+            ).returns([0, 1, 128]).run()
         self.__cache.clear()
 
     def remove_section(self, name):
         """Remove a section in the config file. Silently do nothing if
         the section doesn't exist."""
         Run('git', 'config', '--remove-section', name
-            ).returns([0, 1]).discard_stderr().discard_output()
+            ).returns([0, 1, 128]).discard_stderr().discard_output()
         self.__cache.clear()
 
     def set(self, name, value):