diff --git a/.travis.yml b/.travis.yml
index e590dc3c7..bc2a25266 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -93,6 +93,8 @@ script:
   # Create a .travis.yml, just to make sure it works. It won't be executed.
   - blt ci:travis:init
   - blt ci:pipelines:init
+  # On 8.x only, run tests in docroot/profiles directory.
+  - if [[ "$TRAVIS_PULL_REQUEST" == "false" ]]; then echo $'behat:\n  paths:\n    - ${docroot}/profiles\n    - ${repo.root}/tests/behat' >> project.yml; fi
   # Call targets in the new 'blt-project' project.
   - blt ci:build:validate:test -Dcreate_alias=false -Dbehat.run-server=true -Dbehat.launch-phantom=true
   # Initialize ACSF config.
diff --git a/phing/build.yml b/phing/build.yml
index b90d1a577..ecb2d6346 100644
--- a/phing/build.yml
+++ b/phing/build.yml
@@ -12,9 +12,9 @@ behat:
   # An array of paths with behat tests that should be executed.
   paths:
     # - ${docroot}/modules
-    - ${docroot}/profiles
+    # - ${docroot}/profiles
     - ${repo.root}/tests/behat
-  tags: '~ajax'
+  tags: '~ajax,~experimental,~preview'
   verbose: ${blt.verbose}
 
 blt:
diff --git a/readme/updating-blt.md b/readme/updating-blt.md
index 3a5a5a66b..e3faac132 100644
--- a/readme/updating-blt.md
+++ b/readme/updating-blt.md
@@ -42,6 +42,7 @@ If you are using an older version of BLT that was not installed using Composer,
 
 1. Upgrade to the latest version of BLT:
 
-        composer require acquia/blt:^8.3
+        composer require acquia/blt:^8.3 --no-update
+        composer update
 
 Review and commit changes to your project files. For customized files like `.travis.yml` or `docroot/sites/default/settings.php` it is recommended that you use `git add -p` to select which specific line changes you'd like to stage and commit.
diff --git a/template/composer.json b/template/composer.json
index de5e87a9f..a656ab0f3 100644
--- a/template/composer.json
+++ b/template/composer.json
@@ -56,9 +56,6 @@
             },
             "drupal/features": {
                 "Bundle support": "https://www.drupal.org/files/issues/features-2808303-2.patch"
-            },
-            "drupal/lightning": {
-                "Fix failing Behat test for Selenium": "https://www.drupal.org/files/issues/issue-158-selenium-behat-tests.patch"
             }
         }
     },
diff --git a/template/tests/behat/features/Examples.feature b/template/tests/behat/features/Examples.feature
index da118500d..707aa96a2 100644
--- a/template/tests/behat/features/Examples.feature
+++ b/template/tests/behat/features/Examples.feature
@@ -5,10 +5,10 @@ Feature: Web drivers
   With and without Javascript
 
   @javascript
-  Scenario: Load a page
+  Scenario: Load a page with Javascript
     Given I am on "/"
     Then I should see the text "Log in"
 
-  Scenario: Load a page
+  Scenario: Load a page without Javascript
     Given I am on "/"
     Then I should see the text "Log in"