diff --git a/.travis.yml b/.travis.yml
index b40dbc55ea55bf20e8589e3aac8fc96ee358c8c0..574c59c44846d9616743c1a97e7f221b38111a09 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,7 +34,7 @@ before_install:
   - export ORCA_FIXTURE=$ORCA-build
   - export ORCA_SUT_NAME=drupal/lightning_workflow
   - export ORCA_SUT_BRANCH=8.x-3.x
-  - export ORCA_PACKAGES_CONFIG_ALTER=../lightning-workflow/tests/packages.yml
+  # - export ORCA_PACKAGES_CONFIG_ALTER=../lightning-workflow/tests/packages.yml
 
   - export PATH="$HOME/.composer/vendor/bin:$PATH"
   - export PATH="$ORCA/bin:$PATH"
@@ -52,7 +52,7 @@ install:
   - orca static-analysis:run ./
 
   # Use ORCA to build the code base.
-  - orca fixture:init -f --sut $ORCA_SUT_NAME --core 8.7.x-dev $ORCA_FIXTURE_FLAGS
+  - orca fixture:init -f --sut $ORCA_SUT_NAME $ORCA_FIXTURE_FLAGS
   - # Install dev dependencies.
   - composer require --dev drupal/inline_entity_form --working-dir $ORCA_FIXTURE
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index aaa15e7264eda54a178c725841999b67f223ae29..6d78a1637d5db47eddf9e27de83771fa2bec7a3a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 3.6.0
+* Fixed a bug that could occur with Drupal 8.7 when installing the
+  moderation_history view.
+
 ## 3.5.0
 * Lightning Workflow is now compatible with Lighting Core 4.x
   (Drupal core 8.7.x).
diff --git a/composer.json b/composer.json
index 00881f593fee2a81e62b4eb1fde1cdf35ff6b33e..b6dbc4f51a98250bf7317f1707fbf1280011a17d 100644
--- a/composer.json
+++ b/composer.json
@@ -7,7 +7,7 @@
         "cweagans/composer-patches": "^1.6.4",
         "drupal-composer/drupal-scaffold": "^2.0.0",
         "drupal/diff": "^1.0",
-        "drupal/lightning_core": "3.x-dev || 4.x-dev",
+        "drupal/lightning_core": "^3.9 || ^4.0-beta1",
         "drupal/moderation_dashboard": "^1.0",
         "drupal/moderation_sidebar": "^1.0",
         "oomphinc/composer-installers-extender": "^1.1"
diff --git a/modules/lightning_scheduler/tests/src/Functional/BaseFieldMigrationTest.php b/modules/lightning_scheduler/tests/src/Functional/BaseFieldMigrationTest.php
index 1915961efb85c35412e1473f5318d6b42828361f..d5e5aea260b3984e906835188dc09f45f304ba0b 100644
--- a/modules/lightning_scheduler/tests/src/Functional/BaseFieldMigrationTest.php
+++ b/modules/lightning_scheduler/tests/src/Functional/BaseFieldMigrationTest.php
@@ -8,6 +8,7 @@ use Drupal\node\NodeInterface;
 /**
  * @group lightning_workflow
  * @group lightning_scheduler
+ * @group orca_ignore
  */
 class BaseFieldMigrationTest extends MigrationTestBase {
 
diff --git a/modules/lightning_scheduler/tests/src/Functional/MigrationStatusPageTest.php b/modules/lightning_scheduler/tests/src/Functional/MigrationStatusPageTest.php
index 6ee715874678c71993efdb2d1b7be25fa537f2b8..c30bc2e17c8134c24e1b5d70acf3647e81772293 100644
--- a/modules/lightning_scheduler/tests/src/Functional/MigrationStatusPageTest.php
+++ b/modules/lightning_scheduler/tests/src/Functional/MigrationStatusPageTest.php
@@ -5,6 +5,7 @@ namespace Drupal\Tests\lightning_scheduler\Functional;
 /**
  * @group lightning_workflow
  * @group lightning_scheduler
+ * @group orca_ignore
  */
 class MigrationStatusPageTest extends MigrationTestBase {
 
diff --git a/modules/lightning_scheduler/tests/src/Functional/PurgeTest.php b/modules/lightning_scheduler/tests/src/Functional/PurgeTest.php
index e559b03642417696da6cbe0a66a7d59f0dfc3c9d..f0b8f4176766370f856459f0bbd87c2b7cc54767 100644
--- a/modules/lightning_scheduler/tests/src/Functional/PurgeTest.php
+++ b/modules/lightning_scheduler/tests/src/Functional/PurgeTest.php
@@ -8,6 +8,7 @@ use Drupal\node\NodeInterface;
 /**
  * @group lightning_workflow
  * @group lightning_scheduler
+ * @group orca_ignore
  */
 class PurgeTest extends MigrationTestBase {
 
diff --git a/tests/fixtures/3.6.0.php.gz b/tests/fixtures/3.6.0.php.gz
new file mode 100644
index 0000000000000000000000000000000000000000..c502eab52452c17111eb5e3a628b6c78767b6c09
Binary files /dev/null and b/tests/fixtures/3.6.0.php.gz differ