diff --git a/.travis.yml b/.travis.yml
index 7e134231f4653911edfafb558d5fb2c01ce62447..90a4fb0029a0095be5641075b3245f3c92e3d226 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,7 +12,7 @@ cache:
     - "$HOME/.selenium/cache"
 
 php:
-  - 7.1.11
+  - 7.1.13
 
 env:
   - AFATG=01-website-base-requirements
@@ -24,23 +24,23 @@ env:
 matrix:
   exclude:
 # Automated Functional Acceptance Testing group: 01 website base requirements
-  - php: 7.1.11
+  - php: 7.1.13
     env: AFATG=01-website-base-requirements
 
 # Automated Functional Acceptance Testing group: 02 user management
-  - php: 7.1.11
+  - php: 7.1.13
     env: AFATG=02-user-management
 
 # Automated Functional Acceptance Testing group: 03 admin management
-  - php: 7.1.11
+  - php: 7.1.13
     env: AFATG=03-admin-management
 
 # Automated Functional Acceptance Testing group: 04 content structure
-  - php: 7.1.11
+  - php: 7.1.13
     env: AFATG=04-content-structure
 
 # Automated Functional Acceptance Testing group: 05 content-management
-  - php: 7.1.11
+  - php: 7.1.13
     env: AFATG=05-content-management
 
 addons:
@@ -82,9 +82,9 @@ before_install:
   - phpenv rehash
 
   # Configure and run the virtual display.
-  - export DISPLAY=:0
+  - export DISPLAY=:99
   - sh -e /etc/init.d/xvfb start
-  - Xvfb :0 -ac -screen 0 1366x768x24 &>/dev/null &
+  - Xvfb :99 -ac -screen 0 1366x768x24 &>/dev/null &
   - sleep 3
 
   # Download Chrome Driver.
@@ -115,7 +115,7 @@ install:
 
   ## Install with drush.
   - cd docroot
-  - drush site-install varbase --yes --site-name='Test Varbase4c' --account-name=webmaster --account-pass=dD.123123ddd --account-mail=webmaster@vardot.com --db-url="mysql://root:@localhost/test_varbase4c" varbase_multilingual_configuration.enable_multilingual=true varbase_extra_components.vmi=true varbase_extra_components.varbase_heroslider_media=true varbase_extra_components.varbase_carousels=true varbase_extra_components.varbase_search=true varbase_extra_components.varbase_blog=true varbase_development_tools.varbase_development=true
+  - drush site-install varbase --yes --site-name='Test Varbase4c' --account-name=webmaster --account-pass=dD.123123ddd --account-mail=webmaster@vardot.com --db-url="mysql://root:@localhost/test_varbase4c" varbase_multilingual_configuration.enable_multilingual=true varbase_extra_components.vmi=true varbase_extra_components.varbase_heroslider_media=true varbase_extra_components.varbase_carousels=true varbase_extra_components.varbase_search=true varbase_development_tools.varbase_development=true
   - drush pm-enable vbp_text_and_image --yes
   - drush config-set system.performance css.preprocess 0 --yes
   - drush config-set system.performance js.preprocess 0 --yes
@@ -123,7 +123,6 @@ install:
   - drush cr
 before_script:
   - drush runserver --default-server=builtin 8080 &>/dev/null &
-  - jdk_switcher use oraclejdk8
   - sleep 5
 script:
   - cd ./profiles/varbase
diff --git a/composer.json b/composer.json
index dc7dc273f087a024c3299121b69db8ac10731282..b160fb5ef826b9923c9cee08de2dc9e86de6e1be 100644
--- a/composer.json
+++ b/composer.json
@@ -124,7 +124,7 @@
     "drupal/menu_position": "1.x-dev#d134276b4bbd08b3c9678943d0225fbef7dd05b5",
     "drupal/mail_edit": "1.x-dev#bcd0041830d8581b36e6211f0c8eabd8caf9652b",
     "drupal/taxonomy_access_fix": "2.1",
-    "drupal/taxonomy_menu": "3.3",
+    "drupal/taxonomy_menu": "3.x-dev#1103ad0855de4d242364a5b7e74a5c5fc1ce9e02",
     "drupal/better_exposed_filters": "3.0-alpha3",
     "drupal/autocomplete_deluxe": "1.0-beta1",
     "drupal/link_attributes": "1.2",
@@ -348,6 +348,10 @@
       "drupal/pathologic": {
         "Issue #2927759: Remove the Update hooks for D7 present in D8 version of module.":
         "https://www.drupal.org/files/issues/2927759-8.patch"
+      },
+      "drupal/taxonomy_menu": {
+        "Issue #2939143: Fixed Undefined method TaxonomyMenu::generateTaxonomyLinks()":
+        "https://www.drupal.org/files/issues/2939143-2.patch"  
       }
     }
   }
diff --git a/drupal-org.make b/drupal-org.make
index 01dc718300a3ddeb908693fa3074bd562b5dc47a..d2a91bb075a5472a48fa6e6cb2a7af2c5e73a502 100644
--- a/drupal-org.make
+++ b/drupal-org.make
@@ -260,7 +260,11 @@ projects[taxonomy_access_fix][type] = module
 projects[taxonomy_access_fix][version] = 2.1
 
 projects[taxonomy_menu][type] = module
-projects[taxonomy_menu][version] = 3.3
+projects[taxonomy_menu][download][url] = https://git.drupal.org/project/taxonomy_menu.git
+projects[taxonomy_menu][download][revision] = 1103ad0855de4d242364a5b7e74a5c5fc1ce9e02
+projects[taxonomy_menu][download][branch] = 8.x-3.x
+;; Issue #2939143: Fixed Undefined method TaxonomyMenu::generateTaxonomyLinks()
+projects[taxonomy_menu][patch][] = https://www.drupal.org/files/issues/2939143-2.patch
 
 projects[better_exposed_filters][type] = module
 projects[better_exposed_filters][version] = 3.0-alpha3
diff --git a/tests/features/varbase/step2-apply-tests/04-content-structure/04-06-blog-permissions.feature b/tests/features/varbase/step2-apply-tests/04-content-structure/04-06-blog-permissions-feature.wip
old mode 100755
new mode 100644
similarity index 100%
rename from tests/features/varbase/step2-apply-tests/04-content-structure/04-06-blog-permissions.feature
rename to tests/features/varbase/step2-apply-tests/04-content-structure/04-06-blog-permissions-feature.wip