diff --git a/.tests/.lib.sh b/.tests/.lib.sh
index bfa080a0..833f9022 100644
--- a/.tests/.lib.sh
+++ b/.tests/.lib.sh
@@ -332,7 +332,7 @@ devilbox_start() {
 	_max="90"
 	# shellcheck disable=SC2034
 	for i in $(seq 1 "${_max}"); do
-		if [ "$(  curl --connect-timeout 1 --max-time 1 -s -o /dev/null -w '%{http_code}' http://localhost/index.php )" = "200" ]; then
+		if [ "$(  curl --connect-timeout 1 --max-time 1 -s -o /dev/null -w '%{http_code}' http://127.0.0.1/index.php )" = "200" ]; then
 			break;
 		fi
 		sleep 1
@@ -348,7 +348,7 @@ devilbox_start() {
 
 
 devilbox_print_actual_settings() {
-	VERSIONS="$( curl -q http://localhost/index.php 2>/dev/null | \
+	VERSIONS="$( curl -q http://127.0.0.1/index.php 2>/dev/null | \
         grep -E 'circles' | \
         grep -oE '<strong.*strong>.*\(.*\)' | \
         sed 's/<strong>//g' | \
diff --git a/.tests/test_single.sh b/.tests/test_single.sh
index 1a7ba605..4e00105d 100755
--- a/.tests/test_single.sh
+++ b/.tests/test_single.sh
@@ -122,19 +122,19 @@ print_h1 "Testing"
 
 print_h2 "docker-compose"
 if ! devilbox_test_compose; then
-	devilbox_print_errors "http://localhost/index.php"
+	devilbox_print_errors "http://127.0.0.1/index.php"
 	exit 1
 fi
 
 print_h2 "Testing 'dvlbox-ok': index.php"
-if ! devilbox_test_url "http://localhost/index.php" "dvlbox-ok" "20"; then
-	devilbox_print_errors "http://localhost/index.php"
+if ! devilbox_test_url "http://127.0.0.1/index.php" "dvlbox-ok" "20"; then
+	devilbox_print_errors "http://127.0.0.1/index.php"
 	exit 1
 fi
 
 print_h2 "Testing 'dvlbox-err': index.php"
-if ! devilbox_test_url "http://localhost/index.php" "dvlbox-err" "0"; then
-	devilbox_print_errors "http://localhost/index.php"
+if ! devilbox_test_url "http://127.0.0.1/index.php" "dvlbox-err" "0"; then
+	devilbox_print_errors "http://127.0.0.1/index.php"
 	exit 1
 fi
 
diff --git a/.travis.yml b/.travis.yml
index 5b6b0eb1..b79dee7b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -172,13 +172,12 @@ matrix:
 ###
 before_install:
   # Get newer docker version
-  - sudo apt-get update
-  - sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-engine
+  - max=20; i=0; while [ $i -lt $max ]; do if sudo apt-get update; then break; else i=$((i+1)); fi done
+  - max=20; i=0; while [ $i -lt $max ]; do if sudo apt-get -y -o Dpkg::Options::="--force-confnew" install docker-engine; then break; else i=$((i+1)); fi done
   # Get newer docker-compose version
-  - sudo rm /usr/local/bin/docker-compose
   - curl -L https://github.com/docker/compose/releases/download/1.13.0/docker-compose-`uname -s`-`uname -m` > docker-compose
   - chmod +x docker-compose
-  - sudo mv docker-compose /usr/local/bin
+  - sudo mv -f docker-compose /usr/local/bin
 
 
 ###