diff --git a/tests.sh b/tests.sh
index 858b9ad..9580348 100644
--- a/tests.sh
+++ b/tests.sh
@@ -13,11 +13,12 @@ VERSION="$(cat "$DOCKER_DIR/VERSION")"
 
 # working dirs
 TESTS_DIR=/tmp/docker-int-tests
-FROZEN_IMAGES=/docker-frozen-images
+FROZEN_IMAGES_DIR="$TESTS_DIR/frozen-images"
+FROZEN_IMAGES_LINK=/docker-frozen-images
 BUNDLES_DIR="$TESTS_DIR/run/bundles"
 
-CHECK_TIMEOUT="${CHECK_TIMEOUT:-5m}"
-TEST_TIMEOUT="${TEST_TIMEOUT:-60m}"
+CHECK_TIMEOUT="${CHECK_TIMEOUT:-15m}"
+TEST_TIMEOUT="${TEST_TIMEOUT:-6h}"
 TEST_ARGS=("-check.v" "-check.timeout=${CHECK_TIMEOUT}" "-test.timeout=${TEST_TIMEOUT}")
 TEST_SELECT=
 TEST_LOG=/tmp/docker-tests.log
@@ -191,8 +192,7 @@ cleanup() {
 
 	log "Removing extra files and restoring backups..."
 	restore_backup /etc/subuid /etc/subgid
-	rm -f "$TESTS_DIR/contrib" "$DEST/fixtures"
-	rm -rf "$FROZEN_IMAGES"
+	rm -f "$TESTS_DIR/contrib" "$DEST/fixtures" "$FROZEN_IMAGES_LINK"
 }
 trap cleanup EXIT
 
@@ -206,8 +206,9 @@ bundle .integration-daemon-setup
 # XXX: Really this should be sourced from the Dockerfile but this is good
 #      enough for now. This comes from the Docker 18.09.1-ce Dockerfile.
 log "Downlading frozen images..."
-mkdir -p "$FROZEN_IMAGES"
-"$DOCKER_DIR/contrib/download-frozen-image-v2.sh" "$FROZEN_IMAGES" \
+mkdir -p "$FROZEN_IMAGES_DIR"
+ln -sf "$FROZEN_IMAGES_DIR" "$FROZEN_IMAGES_LINK"
+"$DOCKER_DIR/contrib/download-frozen-image-v2.sh" "$FROZEN_IMAGES_DIR" \
 	buildpack-deps:jessie@sha256:dd86dced7c9cd2a724e779730f0a53f93b7ef42228d4344b25ce9a42a1486251 \
 	busybox:latest@sha256:bbc3a03235220b170ba48a157dd097dd1379299370e1ed99ce976df0355d24f0 \
 	busybox:glibc@sha256:0b55a30394294ab23b9afd58fab94e61a923f5834fba7ddbae7f8e0c11ba85e6 \