diff --git a/tests/deploy.TestCase b/tests/deploy.TestCase
index 7e5b123b..fe6f01cf 100755
--- a/tests/deploy.TestCase
+++ b/tests/deploy.TestCase
@@ -147,7 +147,12 @@ class DeployTest(unittest.TestCase):
         url = Path('url')
         url.mkdir()
 
-        dest_apk = url / fake_apk
+        # setup parameters for this test run
+        fdroidserver.deploy.options.identity_file = None
+        fdroidserver.deploy.options.index_only = False
+        fdroidserver.deploy.config['make_current_version_link'] = False
+
+        dest_apk = Path(url) / fake_apk
         self.assertFalse(dest_apk.is_file())
         fdroidserver.deploy.options = mock.Mock()
         fdroidserver.deploy.options.identity_file = None
@@ -170,6 +175,7 @@ class DeployTest(unittest.TestCase):
         fdroidserver.common.options.identity_file = None
         fdroidserver.common.options.verbose = False
         fdroidserver.common.options.quiet = True
+        fdroidserver.deploy.options.index_only = False
         fdroidserver.deploy.config = {'make_current_version_link': True}
         url = "example.com:/var/www/fdroid"
         repo_section = 'repo'
@@ -264,6 +270,7 @@ class DeployTest(unittest.TestCase):
         fdroidserver.common.options.verbose = True
         fdroidserver.common.options.quiet = False
         fdroidserver.common.options.identity_file = None
+        fdroidserver.deploy.options.index_only = False
         fdroidserver.deploy.config = {'identity_file': './id_rsa'}
         url = "example.com:/var/www/fdroid"
         repo_section = 'archive'