diff --git a/buildscripts/integrationtest.sh b/buildscripts/integrationtest.sh
index 56b623c2fb..41509f0741 100755
--- a/buildscripts/integrationtest.sh
+++ b/buildscripts/integrationtest.sh
@@ -13,8 +13,10 @@ function cleanupAndExit {
     # Check for existence of SUCCESS
     ls test_output/SUCCESS
     exitCode=$?
-    # Clean up test_output dir and exit
-    rm -rf test_output
+    # Clean up test_output dir (if not in CircleCI) and exit
+    if [[ -z "${CIRCLECI}" ]]; then
+        rm -rf test_output
+    fi
     exit $exitCode
 }
 
diff --git a/buildscripts/testclient.sh b/buildscripts/testclient.sh
index 9451c1be89..f5bbe6f692 100755
--- a/buildscripts/testclient.sh
+++ b/buildscripts/testclient.sh
@@ -45,3 +45,6 @@ bin/notary ${OPTS} add ${REPONAME} readmetarget README.md
 bin/notary ${OPTS} publish ${REPONAME}
 bin/notary ${OPTS} delegation list ${REPONAME} | grep targets/releases
 cat README.md | bin/notary ${OPTS} verify $REPONAME readmetarget > /test_output/SUCCESS
+
+# Make this file accessible for CI
+chmod 777 /test_output/SUCCESS