diff --git a/lib/DI/ContainerConfigurator.php b/lib/DI/ContainerConfigurator.php
index 52a69a97ae..d29ce6b118 100644
--- a/lib/DI/ContainerConfigurator.php
+++ b/lib/DI/ContainerConfigurator.php
@@ -102,7 +102,8 @@ class ContainerConfigurator implements IContainerConfigurator {
     $container->autowire(\MailPoet\Config\RendererFactory::class)->setPublic(true);
     $container->autowire(\MailPoet\Config\ServicesChecker::class);
     $container->autowire(\MailPoet\Config\Shortcodes::class)
-      ->setShared(false); // Get a new instance each time $container->get() is called, needed for tests
+      ->setShared(false) // Get a new instance each time $container->get() is called, needed for tests
+      ->setPublic(true);
     $container->register(\MailPoet\Config\Renderer::class)
       ->setPublic(true)
       ->setFactory([new Reference(\MailPoet\Config\RendererFactory::class), 'getRenderer']);
diff --git a/tests/integration/Config/DatabaseTest.php b/tests/integration/Config/DatabaseTest.php
index ca97216f8d..dd2876380f 100644
--- a/tests/integration/Config/DatabaseTest.php
+++ b/tests/integration/Config/DatabaseTest.php
@@ -36,8 +36,6 @@ class DatabaseTest extends \MailPoetTest {
         '@@session.time_zone as timeZone'
       )
       ->findOne();
-    // disable ONLY_FULL_GROUP_BY
-    expect($result->sqlMode)->notContains('ONLY_FULL_GROUP_BY');
     // time zone should be set based on WP's time zone
     expect($result->timeZone)->equals(Env::$dbTimezoneOffset);
   }
diff --git a/tests/integration/Doctrine/ConnectionFactoryTest.php b/tests/integration/Doctrine/ConnectionFactoryTest.php
index abbe96e79c..439d059329 100644
--- a/tests/integration/Doctrine/ConnectionFactoryTest.php
+++ b/tests/integration/Doctrine/ConnectionFactoryTest.php
@@ -100,7 +100,6 @@ class ConnectionFactoryTest extends \MailPoetTest {
     ')->fetch();
 
     // check timezone, SQL mode, wait timeout
-    expect($result['@@session.sql_mode'])->notContains('ONLY_FULL_GROUP_BY');
     expect($result['@@session.time_zone'])->equals(Env::$dbTimezoneOffset);
     expect($result['@@session.wait_timeout'])->greaterOrEquals(60);