diff --git a/modules/openstack_project/manifests/gerrit.pp b/modules/openstack_project/manifests/gerrit.pp
index 1318b5412e..42b827a722 100644
--- a/modules/openstack_project/manifests/gerrit.pp
+++ b/modules/openstack_project/manifests/gerrit.pp
@@ -375,20 +375,22 @@ class openstack_project::gerrit (
       require => Class['::gerrit']
     }
 
-    exec { 'manage_projects':
-      command     => '/usr/local/bin/manage-projects',
-      timeout     => 900, # 15 minutes
-      subscribe   => [
-          File['/home/gerrit2/projects.yaml'],
-          File['/home/gerrit2/acls'],
-        ],
-      refreshonly => true,
-      logoutput   => true,
-      require     => [
-          File['/home/gerrit2/projects.yaml'],
-          File['/home/gerrit2/acls'],
-          Class['jeepyb'],
-        ],
+    if ($testmode == false) {
+      exec { 'manage_projects':
+        command     => '/usr/local/bin/manage-projects',
+        timeout     => 900, # 15 minutes
+        subscribe   => [
+            File['/home/gerrit2/projects.yaml'],
+            File['/home/gerrit2/acls'],
+          ],
+        refreshonly => true,
+        logoutput   => true,
+        require     => [
+            File['/home/gerrit2/projects.yaml'],
+            File['/home/gerrit2/acls'],
+            Class['jeepyb'],
+          ],
+      }
     }
   }
   file { '/home/gerrit2/review_site/bin/set_agreements.sh':
diff --git a/modules/openstack_project/manifests/review.pp b/modules/openstack_project/manifests/review.pp
index 6324ba860d..709317bba1 100644
--- a/modules/openstack_project/manifests/review.pp
+++ b/modules/openstack_project/manifests/review.pp
@@ -76,15 +76,8 @@ class openstack_project::review (
   $swift_password = ''
 ) {
 
-  # Setup MySQL
-  class { 'gerrit::mysql':
-    mysql_root_password  => $mysql_root_password,
-    database_name        => 'reviewdb',
-    database_user        => 'gerrit2',
-    database_password    => $mysql_password,
-  }
-
   class { 'openstack_project::gerrit':
+    testmode                            => true,
     ssl_cert_file                       =>
       '/etc/ssl/certs/review.openstack.org.pem',
     ssl_key_file                        =>