diff --git a/gerrit-acceptance-tests/pom.xml b/gerrit-acceptance-tests/pom.xml
index 410ae66..e79f8a7 100644
--- a/gerrit-acceptance-tests/pom.xml
+++ b/gerrit-acceptance-tests/pom.xml
@@ -115,6 +115,11 @@
   <profiles>
     <profile>
       <id>acceptance</id>
+      <activation>
+        <property>
+          <name>!gerrit.acceptance-tests.skip</name>
+        </property>
+      </activation>
       <build>
         <plugins>
           <plugin>
diff --git a/tools/release.sh b/tools/release.sh
index a63a7a1..88e4a00 100755
--- a/tools/release.sh
+++ b/tools/release.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-flags=-Pacceptance
+flags=
 
 while [ $# -gt 0 ]
 do
@@ -13,8 +13,13 @@
 		flags="$flags -Dgerrit.plugins.skip=true"
 		shift
 		;;
+	--no-tests|--without-tests)
+		flags="$flags -Dgerrit.acceptance-tests.skip=true"
+		flags="$flags -Dmaven.tests.skip=true"
+		shift
+		;;
 	*)
-		echo >&2 "usage: $0 [--no-documentation] [--no-plugins]"
+		echo >&2 "usage: $0 [--no-documentation] [--no-plugins] [--no-tests]"
 		exit 1
 	esac
 done
@@ -29,7 +34,7 @@
 fi
 
 ./tools/version.sh --release &&
-mvn clean package $flags
+mvn clean package verify $flags
 rc=$?
 ./tools/version.sh --reset