diff --git a/storage/tokudb/mysql-test/rpl/suite.pm b/storage/tokudb/mysql-test/rpl/suite.pm
index e001340cd14..ba9809a9930 100644
--- a/storage/tokudb/mysql-test/rpl/suite.pm
+++ b/storage/tokudb/mysql-test/rpl/suite.pm
@@ -7,5 +7,6 @@ $ENV{TOKU_HUGE_PAGES_OK}=1;
 
 #return "Not run for embedded server" if $::opt_embedded_server;
 return "No TokuDB engine" unless $ENV{HA_TOKUDB_SO} or $::mysqld_variables{tokudb};
+
 bless { };
 
diff --git a/storage/tokudb/mysql-test/tokudb/suite.pm b/storage/tokudb/mysql-test/tokudb/suite.pm
index aebfddb661f..6c52d0110fe 100644
--- a/storage/tokudb/mysql-test/tokudb/suite.pm
+++ b/storage/tokudb/mysql-test/tokudb/suite.pm
@@ -8,7 +8,7 @@ $ENV{TOKU_HUGE_PAGES_OK}=1;
 #return "Not run for embedded server" if $::opt_embedded_server;
 return "No TokuDB engine" unless $ENV{HA_TOKUDB_SO} or $::mysqld_variables{tokudb};
 
-sub is_default { 1 }
+sub is_default { not $::opt_embedded_server }
 
 bless { };
 
diff --git a/storage/tokudb/mysql-test/tokudb_add_index/suite.pm b/storage/tokudb/mysql-test/tokudb_add_index/suite.pm
index b318b1fbe33..ee1d1bde06b 100644
--- a/storage/tokudb/mysql-test/tokudb_add_index/suite.pm
+++ b/storage/tokudb/mysql-test/tokudb_add_index/suite.pm
@@ -2,10 +2,13 @@ package My::Suite::TokuDB_add_index;
 use File::Basename;
 @ISA = qw(My::Suite);
 
+# Ensure we can run the TokuDB tests even if hugepages are enabled
+$ENV{TOKU_HUGE_PAGES_OK}=1;
+
 #return "Not run for embedded server" if $::opt_embedded_server;
 return "No TokuDB engine" unless $ENV{HA_TOKUDB_SO} or $::mysqld_variables{tokudb};
 
-sub is_default { 1 }
+sub is_default { not $::opt_embedded_server }
 
 bless { };
 
diff --git a/storage/tokudb/mysql-test/tokudb_alter_table/suite.pm b/storage/tokudb/mysql-test/tokudb_alter_table/suite.pm
index 2be9e69d00b..7981fad2c62 100644
--- a/storage/tokudb/mysql-test/tokudb_alter_table/suite.pm
+++ b/storage/tokudb/mysql-test/tokudb_alter_table/suite.pm
@@ -2,10 +2,13 @@ package My::Suite::TokuDB_alter_table;
 use File::Basename;
 @ISA = qw(My::Suite);
 
+# Ensure we can run the TokuDB tests even if hugepages are enabled
+$ENV{TOKU_HUGE_PAGES_OK}=1;
+
 #return "Not run for embedded server" if $::opt_embedded_server;
 return "No TokuDB engine" unless $ENV{HA_TOKUDB_SO} or $::mysqld_variables{tokudb};
 
-sub is_default { 1 }
+sub is_default { not $::opt_embedded_server }
 
 bless { };
 
diff --git a/storage/tokudb/mysql-test/tokudb_bugs/suite.pm b/storage/tokudb/mysql-test/tokudb_bugs/suite.pm
index b2a3a8addc1..a6e01cd6dd4 100644
--- a/storage/tokudb/mysql-test/tokudb_bugs/suite.pm
+++ b/storage/tokudb/mysql-test/tokudb_bugs/suite.pm
@@ -2,10 +2,13 @@ package My::Suite::TokuDB_bugs;
 use File::Basename;
 @ISA = qw(My::Suite);
 
+# Ensure we can run the TokuDB tests even if hugepages are enabled
+$ENV{TOKU_HUGE_PAGES_OK}=1;
+
 #return "Not run for embedded server" if $::opt_embedded_server;
 return "No TokuDB engine" unless $ENV{HA_TOKUDB_SO} or $::mysqld_variables{tokudb};
 
-sub is_default { 1 }
+sub is_default { not $::opt_embedded_server }
 
 bless { };
 
diff --git a/storage/tokudb/mysql-test/tokudb_mariadb/suite.pm b/storage/tokudb/mysql-test/tokudb_mariadb/suite.pm
index 1522e7c39a4..ab3da8e6b03 100644
--- a/storage/tokudb/mysql-test/tokudb_mariadb/suite.pm
+++ b/storage/tokudb/mysql-test/tokudb_mariadb/suite.pm
@@ -2,10 +2,13 @@ package My::Suite::TokuDB_mariadb;
 use File::Basename;
 @ISA = qw(My::Suite);
 
+# Ensure we can run the TokuDB tests even if hugepages are enabled
+$ENV{TOKU_HUGE_PAGES_OK}=1;
+
 #return "Not run for embedded server" if $::opt_embedded_server;
 return "No TokuDB engine" unless $ENV{HA_TOKUDB_SO} or $::mysqld_variables{tokudb};
 
-sub is_default { 1 }
+sub is_default { not $::opt_embedded_server }
 
 bless { };