diff --git a/tests/gpg/Makefile.am b/tests/gpg/Makefile.am
index 311d7d44..bab9dd9a 100644
--- a/tests/gpg/Makefile.am
+++ b/tests/gpg/Makefile.am
@@ -38,8 +38,8 @@ endif
 c_tests = \
         t-encrypt t-encrypt-sym t-encrypt-sign t-sign t-signers		\
 	t-decrypt t-verify t-decrypt-verify t-sig-notation t-export	\
-	t-import t-edit t-keylist t-keylist-sig t-keylist-secret-sig t-wait	\
-	t-encrypt-large t-file-name t-gpgconf t-encrypt-mixed t-edit-sign	\
+	t-import t-edit t-keylist t-keylist-sig t-keylist-secret-sig t-wait \
+	t-encrypt-large t-file-name t-gpgconf t-encrypt-mixed t-edit-sign \
 	$(tests_unix)
 
 TESTS = initial.test $(c_tests) final.test
diff --git a/tests/start-stop-agent b/tests/start-stop-agent
index 79013741..9b08b55b 100755
--- a/tests/start-stop-agent
+++ b/tests/start-stop-agent
@@ -36,10 +36,10 @@ for F in gpg.conf gpgsm.conf
 do
   if test -f "$GNUPGHOME/$F"
   then
-      mv "$GNUPGHOME/$F" "$GNUPGHOME/$F~"
+      cat "$GNUPGHOME/$F" > "$GNUPGHOME/$F~"
       sed -e "s#^agent-program.*#agent-program ${GPG_AGENT}|--debug-quick-random#" \
           >"$GNUPGHOME/$F" <"$GNUPGHOME/$F~"
-      rm "$GNUPGHOME/$F~"
+      rm -f "$GNUPGHOME/$F~"
   fi
 done