diff --git a/.travis.yml b/.travis.yml
index 0207ec10ccc..b00668cac01 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,6 +4,9 @@ sudo: required
 
 language: php
 
+# Workaround for java not started issues: https://github.com/travis-ci/travis-ci/issues/6928
+group: deprecated
+
 services:
   - mysql
   - postgresql
diff --git a/bin/.travis/prepare_unittest.sh b/bin/.travis/prepare_unittest.sh
index 406de084a21..194a41fa89c 100755
--- a/bin/.travis/prepare_unittest.sh
+++ b/bin/.travis/prepare_unittest.sh
@@ -42,6 +42,9 @@ if [ "$TEST_CONFIG" = "phpunit-integration-legacy-solr.xml" ] ; then
     echo "> Require ezsystems/ezplatform-solr-search-engine:^1.1.0@dev"
     composer require --no-update ezsystems/ezplatform-solr-search-engine:^1.1.0@dev
     COMPOSER_UPDATE="true"
+
+    # Because of either some changes in travis, composer or git, composer is not able to pick version for "self" on inclusion of solr anymore, so we force it:
+    export COMPOSER_ROOT_VERSION=`php -r 'echo json_decode(file_get_contents("./composer.json"), true)["extra"]["branch-alias"]["dev-tmp_ci_branch"];'`
 fi
 
 # Switch to another Symfony version if asked for