diff --git a/storage/oqgraph/CMakeLists.txt b/storage/oqgraph/CMakeLists.txt
index 3f592133969..0c361e27707 100644
--- a/storage/oqgraph/CMakeLists.txt
+++ b/storage/oqgraph/CMakeLists.txt
@@ -51,6 +51,7 @@ IF(BOOST_OK)
                    oqgraph_shim.cc oqgraph_thunk.cc oqgraph_judy.cc
                    STORAGE_ENGINE
                    MODULE_ONLY
+                   RECOMPILE_FOR_EMBEDDED
                    COMPONENT oqgraph-engine
                    LINK_LIBRARIES ${Judy_LIBRARIES})
   MESSAGE(STATUS "OQGraph OK")
diff --git a/storage/oqgraph/mysql-test/oqgraph/suite.pm b/storage/oqgraph/mysql-test/oqgraph/suite.pm
index 172c71c0e4c..118ecfa7c60 100644
--- a/storage/oqgraph/mysql-test/oqgraph/suite.pm
+++ b/storage/oqgraph/mysql-test/oqgraph/suite.pm
@@ -5,6 +5,9 @@ package My::Suite::OQGraph;
 return "No OQGraph" unless $ENV{HA_OQGRAPH_SO} or
                            $::mysqld_variables{'oqgraph'} eq "ON";
 
+# as long as OQGraph defines MYSQL_SERVER it cannot run in embedded
+return "Not run for embedded server" if $::opt_embedded_server;
+
 sub is_default { 1 }
 
 bless { };