diff --git a/test/common-tap.js b/test/common-tap.js
index e02e8c2b98ce8..d54a869995451 100644
--- a/test/common-tap.js
+++ b/test/common-tap.js
@@ -138,6 +138,9 @@ exports.makeGitRepo = function (params, cb) {
     git.chainableExec(['init'], opts),
     git.chainableExec(['config', 'user.name', user], opts),
     git.chainableExec(['config', 'user.email', email], opts),
+    // don't time out tests waiting for a gpg passphrase or 2fa
+    git.chainableExec(['config', 'commit.gpgsign', 'false'], opts),
+    git.chainableExec(['config', 'tag.forceSignAnnotated', 'false'], opts),
     git.chainableExec(['add'].concat(added), opts),
     git.chainableExec(['commit', '-m', message], opts)
   ]