diff --git a/.circleci/config.yml b/.circleci/config.yml
index e4693a0a921d873c38f1a780a74f1dd1aa5d949f..828d06fc8bc5068b3973abe286b22d0f6272710a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -129,13 +129,6 @@ jobs:
             drush config-set system.logging error_level all --yes
             drush cr
 
-      ## Run Drush server on 8080 port.
-      - run:
-          name: Run Drush server on 8080 port
-          command: |
-            drush runserver --default-server=builtin 8080 &>/dev/null &
-            sleep 5
-
       ## Automated Functional Acceptance Testing.
       - run:
           name: Automated Functional Acceptance Testing
diff --git a/behat.varbase.yml b/behat.varbase.yml
index f58a6ecf2f7762677aed2fa414e4b522e701e5fa..a838baa013947c435b3b7f19836438cf0de6fbcf 100644
--- a/behat.varbase.yml
+++ b/behat.varbase.yml
@@ -86,7 +86,7 @@ default:
               - "disable-infobars"
               - "js-flags=--expose-gc"
               - "no-sandbox"
-      base_url: 'http://127.0.0.1:8080'
+      base_url: 'http://127.0.0.1'
       # browser_name: 'firefox'
       browser_name: 'chrome'
       # browser_name: 'phantomjs'