diff --git a/mysql-test/include/galera_variables_ok.inc b/mysql-test/include/galera_variables_ok.inc
index c9a54724c17..d10bf1fd36e 100644
--- a/mysql-test/include/galera_variables_ok.inc
+++ b/mysql-test/include/galera_variables_ok.inc
@@ -1,9 +1,16 @@
 --disable_query_log
 
---let $galera_variables_ok = `SELECT COUNT(*) = 50 FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME LIKE 'wsrep%'`
+let $_galera_variables_delta=$galera_variables_delta;
+if (!$_galera_variables_delta) {
+--let $galera_variables_delta=0
+}
 
---if (!$galera_variables_ok) {
-	--skip Galera number of variables has changed!
+--let $galera_variables_expected=`SELECT 50 + $galera_variables_delta`
+
+--let $galera_variables_count=`SELECT COUNT(*) FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME LIKE 'wsrep%'`
+
+--if ($galera_variables_count != $galera_variables_expected) {
+	--skip Galera number of variables has changed! ($galera_variables_count instead of $galera_variables_expected)
 }
 
 --enable_query_log
diff --git a/mysql-test/include/galera_variables_ok_debug.inc b/mysql-test/include/galera_variables_ok_debug.inc
index e420b3af6c3..495b850c871 100644
--- a/mysql-test/include/galera_variables_ok_debug.inc
+++ b/mysql-test/include/galera_variables_ok_debug.inc
@@ -1,9 +1,5 @@
---disable_query_log
+# Now the number of variables for the release and debug versions
+# of the library is equal to each other...
+--let $galera_variables_delta=0
 
---let $galera_variables_ok = `SELECT COUNT(*) = 51 FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME LIKE 'wsrep%'`
-
---if (!$galera_variables_ok) {
-	--skip Galera number of variables has changed!
-}
-
---enable_query_log
+--source include/galera_variables_ok.inc