diff --git a/mysql-test/include/have_innodb.combinations b/mysql-test/include/have_innodb.combinations
index f647f15ddb6..3c5cfa7bd5a 100644
--- a/mysql-test/include/have_innodb.combinations
+++ b/mysql-test/include/have_innodb.combinations
@@ -24,7 +24,7 @@ innodb-sys-foreign
 innodb-sys-foreign-col
 innodb-metrics
 
-[xtradb]
+[innodb]
 innodb
 innodb-cmpmem
 innodb-trx
diff --git a/mysql-test/include/have_xtradb.combinations b/mysql-test/include/have_xtradb.combinations
index 13d8ab915f5..20e07c62635 100644
--- a/mysql-test/include/have_xtradb.combinations
+++ b/mysql-test/include/have_xtradb.combinations
@@ -5,12 +5,9 @@ innodb
 innodb-cmpmem
 innodb-trx
 innodb-sys-index
-loose-xtradb-admin-command
 
 [xtradb]
 innodb
 innodb-cmpmem
 innodb-trx
 innodb-sys-index
-loose-xtradb-admin-command
-
diff --git a/mysql-test/suite.pm b/mysql-test/suite.pm
index 3dbacc7f8fc..7f676b7ccfd 100644
--- a/mysql-test/suite.pm
+++ b/mysql-test/suite.pm
@@ -8,8 +8,14 @@ sub skip_combinations {
 
   # disable innodb/xtradb combinatons for configurations that were not built
   push @combinations, 'innodb_plugin' unless $ENV{HA_INNODB_SO};
-  push @combinations, 'xtradb_plugin' unless $ENV{HA_XTRADB_SO};
-  push @combinations, 'xtradb' unless $::mysqld_variables{'innodb'} eq "ON";
+
+  # if something is compiled in, it's innodb. xtradb is MODULE_ONLY:
+  push @combinations, 'innodb' unless $::mysqld_variables{'innodb'} eq "ON";
+  push @combinations, 'xtradb';
+
+  # XtraDB is RECOMPILE_FOR_EMBEDDED, ha_xtradb.so cannot work with embedded server
+  push @combinations, 'xtradb_plugin' if not $ENV{HA_XTRADB_SO}
+                                          or $::opt_embedded_server;
 
   my %skip = ( 'include/have_innodb.combinations' => [ @combinations ],
                'include/have_xtradb.combinations' => [ @combinations ]);