diff --git a/core/modules/outside_in/tests/src/FunctionalJavascript/OffCanvasTest.php b/core/modules/outside_in/tests/src/FunctionalJavascript/OffCanvasTest.php
index a7deb91..37d05e6 100644
--- a/core/modules/outside_in/tests/src/FunctionalJavascript/OffCanvasTest.php
+++ b/core/modules/outside_in/tests/src/FunctionalJavascript/OffCanvasTest.php
@@ -6,6 +6,8 @@
 
 /**
  * Tests the off-canvas tray functionality.
+ *
+ * @group outside_in
  */
 class OffCanvasTest extends JavascriptTestBase {
 
diff --git a/core/modules/outside_in/tests/src/Kernel/MultipleBlockFormTest.php b/core/modules/outside_in/tests/src/Kernel/MultipleBlockFormTest.php
index 7f4e694..0899585 100644
--- a/core/modules/outside_in/tests/src/Kernel/MultipleBlockFormTest.php
+++ b/core/modules/outside_in/tests/src/Kernel/MultipleBlockFormTest.php
@@ -15,7 +15,7 @@ class MultipleBlockFormTest extends KernelTestBase {
   /**
    * @var array
    */
-  public static $modules = ['system', 'outside_in', 'offcanvas_test'];
+  public static $modules = ['system', 'block', 'outside_in', 'offcanvas_test'];
 
   /**
    * Tests that blocks can have multiple forms.
diff --git a/core/modules/system/tests/fixtures/HtaccessTest/access_test.module.orig b/core/modules/system/tests/fixtures/HtaccessTest/access_test.module.orig
new file mode 100644
index 0000000..e69de29
diff --git a/core/modules/system/tests/fixtures/HtaccessTest/access_test.php.orig b/core/modules/system/tests/fixtures/HtaccessTest/access_test.php.orig
new file mode 100644
index 0000000..e69de29