diff --git a/src/test/cucumber/gvm/upgrade.feature b/src/test/cucumber/gvm/upgrade.feature
index 9a6613c1c..30f4e0bb5 100644
--- a/src/test/cucumber/gvm/upgrade.feature
+++ b/src/test/cucumber/gvm/upgrade.feature
@@ -1,5 +1,6 @@
 Feature: Upgrade
 
+	@manual
 	Scenario: Upgrade an outdated installation
 		Given an initialised system
 		When I enter "gvm selfupdate"
diff --git a/src/test/groovy/gvm/VertxUtils.groovy b/src/test/groovy/gvm/VertxUtils.groovy
index f76760f7d..271803df3 100644
--- a/src/test/groovy/gvm/VertxUtils.groovy
+++ b/src/test/groovy/gvm/VertxUtils.groovy
@@ -30,15 +30,15 @@ class VertxUtils {
 		def rm = new RouteMatcher()
 
 		rm.get("/") { req ->
-			req.response.sendFile('srv/scripts/install.sh')
+			req.response.sendFile('build/scripts/install.sh')
 		}
 
 		rm.get("/selfupdate") { req ->
-			req.response.sendFile('src/test/resources/selfupdate.sh')
+			req.response.sendFile('build/scripts/selfupdate.sh')
 		}
 
 		rm.get("/res") { req ->
-			req.response.sendFile('src/test/resources/res.zip')
+			req.response.sendFile('build/distributions/gvm-scripts.zip')
 		}
 
 		rm.get("/candidates") { req ->
diff --git a/src/test/resources/res.zip b/src/test/resources/res.zip
deleted file mode 100644
index 545e08d5a..000000000
Binary files a/src/test/resources/res.zip and /dev/null differ
diff --git a/src/test/resources/selfupdate.sh b/src/test/resources/selfupdate.sh
deleted file mode 100755
index 5ecfc9893..000000000
--- a/src/test/resources/selfupdate.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/bash
-
-echo "Updating gvm scripts..."
-TMP_ZIP="/tmp/res.zip"
-BIN_FOLDER="/tmp/gvm/bin"
-
-echo "Creating $BIN_FOLDER"
-mkdir -p "$BIN_FOLDER"
-
-echo "Calling $GVM_SERVICE/res?platform=$PLATFORM"
-curl -s "$GVM_SERVICE/res?platform=$PLATFORM" > "$TMP_ZIP"
-
-echo "Unzip to $BIN_FOLDER"
-unzip -qo "$TMP_ZIP" -d "$BIN_FOLDER"
-rm "$TMP_ZIP"
-
-chmod +x "$BIN_FOLDER"/*
-
-echo ""
-echo "Successfully upgraded GVM."
-echo ""