diff --git a/.vagrant-puppet/modules/mysql/manifests/database/populate.pp b/.vagrant-puppet/modules/mysql/manifests/database/populate.pp
index 2d40af0b9..39b819e1e 100644
--- a/.vagrant-puppet/modules/mysql/manifests/database/populate.pp
+++ b/.vagrant-puppet/modules/mysql/manifests/database/populate.pp
@@ -32,7 +32,7 @@ define mysql::database::populate ($username, $password, $privileges, $schemafile
   }
 
   exec { "populate-${name}-mysql-db":
-    unless  => "mysql -u${username} -p${password} ${name} -e \"SELECT * FROM icinga_dbversion;\" &> /dev/null",
+    onlyif  => "mysql -u${username} -p${password} ${name} -e \"SELECT COUNT(*) FROM information_schema.tables WHERE table_schema = '${name}';\" 2>/dev/null |grep -qEe '^ *0 *$'",
     command => "mysql -uroot ${name} < ${schemafile}",
     require => Mysql::Database::Create[$name],
   }