diff --git a/data/20_elementary.pantheon.wm.gschema.override b/data/20_elementary.pantheon.wm.gschema.override
index 244017fea..2ef52e73c 100644
--- a/data/20_elementary.pantheon.wm.gschema.override
+++ b/data/20_elementary.pantheon.wm.gschema.override
@@ -2,7 +2,6 @@
 dynamic-workspaces = true
 attach-modal-dialogs = false
 edge-tiling = true
-experimental-features = ['scale-monitor-framebuffer']
 
 [org.gnome.desktop.wm.preferences:Pantheon]
 button-layout='close:maximize'
diff --git a/tests/MutterTestCase.vala b/tests/MutterTestCase.vala
index 1998eb81f..2dd285fab 100644
--- a/tests/MutterTestCase.vala
+++ b/tests/MutterTestCase.vala
@@ -25,39 +25,40 @@ public abstract class Gala.MutterTestCase : Gala.TestCase {
         "--virtual-monitor", "1280x720@60"
     };
 
-    protected Meta.Context context { get; private set; }
+    protected Meta.Context? context { get; private set; }
     protected Clutter.Stage stage { get { return (Clutter.Stage) context.get_backend ().get_stage (); } }
 
     private MainLoop? main_loop;
 
-    construct {
-        context = new Meta.Context ("");
-
-        unowned var unowned_args = MUTTER_ARGS;
-        try {
-            context.configure (ref unowned_args);
-        } catch (Error e) {
-            assert_no_error (e);
-        }
-
-        context.set_plugin_gtype (typeof (MockPlugin));
-
-        try {
-            context.setup ();
-        } catch (Error e) {
-            assert_no_error (e);
-        }
-
-        try {
-            context.start ();
-        } catch (Error e) {
-            assert_no_error (e);
-        }
-    }
-
     public override void set_up () {
         Test.log_set_fatal_handler (fatal_log_handler);
 
+        if (context == null) {
+            /* We can only create the context once, because Mutter doesn't allow recreating it */
+            context = new Meta.Context ("");
+
+            unowned var unowned_args = MUTTER_ARGS;
+            try {
+                context.configure (ref unowned_args);
+            } catch (Error e) {
+                assert_no_error (e);
+            }
+
+            context.set_plugin_gtype (typeof (MockPlugin));
+
+            try {
+                context.setup ();
+            } catch (Error e) {
+                assert_no_error (e);
+            }
+
+            try {
+                context.start ();
+            } catch (Error e) {
+                assert_no_error (e);
+            }
+        }
+
         main_loop = new MainLoop (null, false);
     }
 
@@ -74,6 +75,12 @@ public abstract class Gala.MutterTestCase : Gala.TestCase {
             return false;
         }
 
+        if (domain == "libmutter" && FLAG_FATAL in level && "Failed to make thread" in message) {
+            /* Mutter sends a fatal log when failing to make a thread rt scheduled but that doesn't matter for us */
+            Test.message ("Got expected fatal make thread rt log, not aborting");
+            return false;
+        }
+
         return true;
     }
 
diff --git a/tests/lib/SwipeTriggerTest.vala b/tests/lib/SwipeTriggerTest.vala
index 4810e64b6..4cd2ab60e 100644
--- a/tests/lib/SwipeTriggerTest.vala
+++ b/tests/lib/SwipeTriggerTest.vala
@@ -16,6 +16,8 @@ public class Gala.SwipeTriggerTest : MutterTestCase {
     }
 
     public override void set_up () {
+        base.set_up ();
+
         actor = new Clutter.Actor ();
         trigger = new SwipeTrigger (actor, Clutter.Orientation.HORIZONTAL);
     }