diff --git a/mysql-test/include/have_debug.inc b/mysql-test/include/have_debug.inc
index 5432f7dfa7e..5df3080a6ed 100644
--- a/mysql-test/include/have_debug.inc
+++ b/mysql-test/include/have_debug.inc
@@ -4,7 +4,6 @@
 #
 # The test below is redundant
 
--- require r/have_debug.require
-disable_query_log;
-select (version() like '%debug%') as debug;
-enable_query_log;
+if (`select version() not like '%debug%'`) {
+  --skip Needs a debug build
+}
diff --git a/mysql-test/include/have_nodebug.inc b/mysql-test/include/have_nodebug.inc
deleted file mode 100644
index 3a5b073cd2e..00000000000
--- a/mysql-test/include/have_nodebug.inc
+++ /dev/null
@@ -1,4 +0,0 @@
--- require r/have_nodebug.require
-disable_query_log;
-select (version() like '%debug%') as debug;
-enable_query_log;
diff --git a/mysql-test/include/not_debug.inc b/mysql-test/include/not_debug.inc
index 5ea01fe2935..5917e6bccdd 100644
--- a/mysql-test/include/not_debug.inc
+++ b/mysql-test/include/not_debug.inc
@@ -1,6 +1,5 @@
-let $is_debug = `select version() like '%debug%'`;
-if ($is_debug)
+if (`select version() like '%debug%'`)
 {
-  skip Does not run in with debug binaries;
+  skip Does not run with debug binaries;
 }
 
diff --git a/mysql-test/r/have_debug.require b/mysql-test/r/have_debug.require
deleted file mode 100644
index 714922cee63..00000000000
--- a/mysql-test/r/have_debug.require
+++ /dev/null
@@ -1,2 +0,0 @@
-debug
-1
diff --git a/mysql-test/r/have_nodebug.require b/mysql-test/r/have_nodebug.require
deleted file mode 100644
index ff251521aa8..00000000000
--- a/mysql-test/r/have_nodebug.require
+++ /dev/null
@@ -1,2 +0,0 @@
-debug
-0
diff --git a/mysql-test/suite/percona/percona_server_variables_release.test b/mysql-test/suite/percona/percona_server_variables_release.test
index b145843ab22..6427045864c 100644
--- a/mysql-test/suite/percona/percona_server_variables_release.test
+++ b/mysql-test/suite/percona/percona_server_variables_release.test
@@ -1,2 +1,2 @@
---source include/have_nodebug.inc
+--source include/not_debug.inc
 --source percona_server_variables.inc
diff --git a/mysql-test/r/variables_debug.result b/mysql-test/suite/sys_vars/r/debug_dbug_func.result
similarity index 100%
rename from mysql-test/r/variables_debug.result
rename to mysql-test/suite/sys_vars/r/debug_dbug_func.result
diff --git a/mysql-test/r/variables_debug_notembedded.result b/mysql-test/suite/sys_vars/r/debug_dbug_func_notembedded.result
similarity index 100%
rename from mysql-test/r/variables_debug_notembedded.result
rename to mysql-test/suite/sys_vars/r/debug_dbug_func_notembedded.result
diff --git a/mysql-test/r/variables-big.result b/mysql-test/suite/sys_vars/r/transaction_prealloc_size_bug27322.result
similarity index 100%
rename from mysql-test/r/variables-big.result
rename to mysql-test/suite/sys_vars/r/transaction_prealloc_size_bug27322.result
diff --git a/mysql-test/t/variables_debug.test b/mysql-test/suite/sys_vars/t/debug_dbug_func.test
similarity index 100%
rename from mysql-test/t/variables_debug.test
rename to mysql-test/suite/sys_vars/t/debug_dbug_func.test
diff --git a/mysql-test/t/variables_debug_notembedded.test b/mysql-test/suite/sys_vars/t/debug_dbug_func_notembedded.test
similarity index 100%
rename from mysql-test/t/variables_debug_notembedded.test
rename to mysql-test/suite/sys_vars/t/debug_dbug_func_notembedded.test
diff --git a/mysql-test/t/variables-big.test b/mysql-test/suite/sys_vars/t/transaction_prealloc_size_bug27322.test
similarity index 100%
rename from mysql-test/t/variables-big.test
rename to mysql-test/suite/sys_vars/t/transaction_prealloc_size_bug27322.test
diff --git a/mysql-test/t/sp-no-code.test b/mysql-test/t/sp-no-code.test
index ce16c32a270..47a1a126627 100644
--- a/mysql-test/t/sp-no-code.test
+++ b/mysql-test/t/sp-no-code.test
@@ -2,7 +2,7 @@
 # Test the debugging feature "show procedure/function code <name>" 
 #
 
--- source include/have_nodebug.inc
+-- source include/not_debug.inc
 
 --error ER_FEATURE_DISABLED
 show procedure code foo;