diff --git a/mysql-test/include/is_embedded.inc b/mysql-test/include/is_embedded.inc
index 6d95772843c..b20f21953f0 100644
--- a/mysql-test/include/is_embedded.inc
+++ b/mysql-test/include/is_embedded.inc
@@ -1,5 +1,5 @@
--- require r/is_embedded.require
-disable_query_log;
-select version() like '%embedded%' as 'have_embedded';
-enable_query_log;
+if (`SELECT VERSION() NOT LIKE '%embedded%'`)
+{
+   --skip Test requires: embedded server
+}
 
diff --git a/mysql-test/r/is_embedded.require b/mysql-test/r/is_embedded.require
deleted file mode 100644
index 10594809fe7..00000000000
--- a/mysql-test/r/is_embedded.require
+++ /dev/null
@@ -1,2 +0,0 @@
-have_embedded
-1
diff --git a/mysql-test/suite/funcs_1/t/is_columns_is_embedded.test b/mysql-test/suite/funcs_1/t/is_columns_is_embedded.test
index c0829ab2636..9db247fd6fd 100644
--- a/mysql-test/suite/funcs_1/t/is_columns_is_embedded.test
+++ b/mysql-test/suite/funcs_1/t/is_columns_is_embedded.test
@@ -13,12 +13,8 @@
 # 2008-06-06 mleich Create this variant for the embedded server
 #
 
---source include/have_xtradb.inc
-
-if (`SELECT VERSION() NOT LIKE '%embedded%'`)
-{
-   --skip Test requires: embedded server
-}
+--source include/have_innodb.inc
+--source include/is_embedded.inc
 
 let $my_where = WHERE table_schema = 'information_schema'
 AND table_name <> 'profiling' AND table_name not like 'innodb_%';