diff --git a/fdroid b/fdroid
index ec9bae2c..4147119d 100755
--- a/fdroid
+++ b/fdroid
@@ -126,7 +126,7 @@ def main():
     # temporary workaround until server.py becomes deploy.py
     if command == 'deploy':
         command = 'server'
-        sys.argv.insert(1, 'update')
+        sys.argv.insert(2, 'update')
 
     # Trick optparse into displaying the right usage when --help is used.
     sys.argv[0] += ' ' + command
diff --git a/tests/run-tests b/tests/run-tests
index 16ecfdb9..e0ea2aa1 100755
--- a/tests/run-tests
+++ b/tests/run-tests
@@ -610,6 +610,7 @@ $fdroid gpgsign
 $fdroid lint
 $fdroid readmeta
 $fdroid rewritemeta fake
+$fdroid deploy
 $fdroid server update
 $fdroid scanner
 
@@ -643,6 +644,7 @@ $fdroid init
 $fdroid update --create-metadata --verbose
 $fdroid readmeta
 $fdroid server update --local-copy-dir=/tmp/fdroid
+$fdroid deploy --local-copy-dir=/tmp/fdroid --verbose
 
 # now test the errors work
 set +e