diff --git a/script/ci/push_to_production.sh b/script/ci/push_to_production.sh
index 72fa2a5edc..b731b538ca 100755
--- a/script/ci/push_to_production.sh
+++ b/script/ci/push_to_production.sh
@@ -9,7 +9,7 @@ if [[ "$PROD_TEST" != *production* ]]; then
 fi
 
 echo "--- Saving baseline data for staging"
-ssh ofn-staging2 "/home/openfoodweb/apps/openfoodweb/current/script/save_staging_baseline.sh $BUILDKITE_COMMIT"
+ssh ofn-staging2 "/home/openfoodweb/apps/openfoodweb/current/script/ci/save_staging_baseline.sh $BUILDKITE_COMMIT"
 
 echo "--- Pushing to production"
 [[ $(git push production $BUILDKITE_COMMIT:master --force 2>&1) =~ "Done" ]]
diff --git a/script/ci/push_to_staging.sh b/script/ci/push_to_staging.sh
index 75bccd6e09..582f500a76 100755
--- a/script/ci/push_to_staging.sh
+++ b/script/ci/push_to_staging.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 set -e
-source ./script/includes.sh
+source ./script/ci/includes.sh
 
 # Add staging git remote if required
 ST2_TEST=`git remote | grep -s 'staging2' || true`
@@ -13,7 +13,7 @@ echo "--- Verifying branch is based on current master"
 exit_unless_master_merged
 
 echo "--- Loading baseline data"
-ssh ofn-staging2 "/home/openfoodweb/apps/openfoodweb/current/script/load_staging_baseline.sh"
+ssh ofn-staging2 "/home/openfoodweb/apps/openfoodweb/current/script/ci/load_staging_baseline.sh"
 
 echo "--- Pushing to staging"
 [[ $(git push staging2 $BUILDKITE_COMMIT:master --force 2>&1) =~ "Done" ]]
diff --git a/script/ci/run_tests.sh b/script/ci/run_tests.sh
index 616d454e5d..0ccbc7421d 100755
--- a/script/ci/run_tests.sh
+++ b/script/ci/run_tests.sh
@@ -3,7 +3,7 @@
 set -e
 
 echo "--- Loading environment"
-source ./script/includes.sh
+source ./script/ci/includes.sh
 source /var/lib/jenkins/.rvm/environments/ruby-1.9.3-p392
 if [ ! -f config/application.yml ]; then
     ln -s application.yml.example config/application.yml