diff --git a/fdroidserver/verify.py b/fdroidserver/verify.py
index aac0a515..03787179 100644
--- a/fdroidserver/verify.py
+++ b/fdroidserver/verify.py
@@ -104,9 +104,11 @@ def main():
             logging.info("...NOT verified - {0}".format(e))
             notverified += 1
 
-    logging.info(_("Finished"))
-    logging.info("{0} successfully verified".format(verified))
-    logging.info("{0} NOT verified".format(notverified))
+    if verified > 0:
+        logging.info("{0} successfully verified".format(verified))
+    if notverified > 0:
+        logging.info("{0} NOT verified".format(notverified))
+    sys.exit(notverified)
 
 
 if __name__ == "__main__":
diff --git a/tests/run-tests b/tests/run-tests
index e0ea2aa1..f17f933b 100755
--- a/tests/run-tests
+++ b/tests/run-tests
@@ -447,6 +447,21 @@ test -e repo/com.politedroid_5.apk
 ! test -e repo/com.politedroid_6.apk
 
 
+#------------------------------------------------------------------------------#
+echo_header 'test that verify can succeed and fail'
+
+REPOROOT=`create_test_dir`
+cd $REPOROOT
+test -d tmp || mkdir tmp
+test -d unsigned || mkdir unsigned
+cp $WORKSPACE/tests/repo/com.politedroid_6.apk tmp/
+cp $WORKSPACE/tests/repo/com.politedroid_6.apk unsigned/
+$fdroid verify --reuse-remote-apk --verbose com.politedroid
+# force a fail
+cp $WORKSPACE/tests/repo/com.politedroid_5.apk unsigned/com.politedroid_6.apk
+! $fdroid verify --reuse-remote-apk --verbose com.politedroid
+
+
 #------------------------------------------------------------------------------#
 echo_header 'test allowing disabled signatures in repo and archive'