diff --git a/ci/images/setup.sh b/ci/images/setup.sh
index 7f3e227..1d1f670 100755
--- a/ci/images/setup.sh
+++ b/ci/images/setup.sh
@@ -58,5 +58,3 @@ mkdir -p /opt/gradle
 cd /opt/gradle
 curl -L $GRADLE_URL | bsdtar --strip-components=1 -xvf-
 chmod +x /opt/gradle/bin/gradle
-mkdir ~/.gradle
-echo 'systemProp.user.name=concourse' > ~/.gradle/gradle.properties
diff --git a/ci/scripts/common.sh b/ci/scripts/common.sh
index 16c1c3d..bba8ac4 100644
--- a/ci/scripts/common.sh
+++ b/ci/scripts/common.sh
@@ -1,3 +1,5 @@
 source /opt/concourse-java.sh
 
 setup_symlinks
+
+echo 'systemProp.user.name=concourse' > ~/.gradle/gradle.properties
diff --git a/ci/scripts/smoke-test.sh b/ci/scripts/smoke-test.sh
index e5b4aa0..80471e6 100755
--- a/ci/scripts/smoke-test.sh
+++ b/ci/scripts/smoke-test.sh
@@ -4,5 +4,5 @@ set -e
 source $(dirname $0)/common.sh
 
 pushd git-repo > /dev/null
-./gradlew --no-daemon ${SMOKE_TEST}:${TASK}
+gradle --no-daemon ${SMOKE_TEST}:${TASK}
 popd > /dev/null