diff --git a/ci/download-df.sh b/ci/download-df.sh
index 49dcedea7..2fd095c1d 100755
--- a/ci/download-df.sh
+++ b/ci/download-df.sh
@@ -2,7 +2,8 @@
 
 set -e
 
-tardest="df.tar.bz2"
+df_tardest="df.tar.bz2"
+save_tardest="test_save.tgz"
 
 selfmd5=$(openssl md5 < "$0")
 echo $selfmd5
@@ -16,40 +17,48 @@ cd "$DF_FOLDER/.."
 
 if [ -f receipt ]; then
     if [ "$selfmd5" != "$(cat receipt)" ]; then
-        echo "download-df.sh changed; removing DF"
+        echo "download-df.sh changed; re-downloading tarballs"
         rm receipt
     else
-        echo "Already downloaded $DF_VERSION"
+        echo "Already downloaded $DF_VERSION tarballs"
     fi
 fi
 
 if [ ! -f receipt ]; then
-    rm -f "$tardest"
+    rm -f "$df_tardest" "$save_tardest"
     minor=$(echo "$DF_VERSION" | cut -d. -f2)
     patch=$(echo "$DF_VERSION" | cut -d. -f3)
-    url="http://www.bay12games.com/dwarves/df_${minor}_${patch}_linux.tar.bz2"
-    echo Downloading
+    echo "Downloading DF $DF_VERSION"
     while read url; do
         echo "Attempting download: ${url}"
-        if wget -v "$url" -O "$tardest"; then
+        if wget -v "$url" -O "$df_tardest"; then
             break
         fi
     done <<URLS
     https://www.bay12games.com/dwarves/df_${minor}_${patch}_linux.tar.bz2
     https://files.dfhack.org/DF/0.${minor}.${patch}/df_${minor}_${patch}_linux.tar.bz2
 URLS
-    echo $tardest
-    if ! test -f "$tardest"; then
-        echo "DF failed to download: $tardest not found"
+    echo $df_tardest
+    if ! test -f "$df_tardest"; then
+        echo "DF failed to download: $df_tardest not found"
         exit 1
     fi
+    echo "Downloading test save"
+    #test_save_url="https://files.dfhack.org/DF/0.${minor}.${patch}/test_save.tgz"
+    test_save_url="https://drive.google.com/uc?export=download&id=1XvYngl-DFONiZ9SD9OC4B2Ooecu8rPFz"
+    if ! wget -v "$test_save_url" -O "$save_tardest"; then
+        echo "failed to download test save"
+        exit 1
+    fi
+    echo $save_tardest
 fi
 
 rm -rf df_linux
-mkdir df_linux
+mkdir -p df_linux/data/save
 
 echo Extracting
-tar xf "$tardest" --strip-components=1 -C df_linux
+tar xf "$df_tardest" --strip-components=1 -C df_linux
+tar xf "$save_tardest" -C df_linux/data/save
 echo Done
 
 echo "$selfmd5" > receipt
diff --git a/ci/run-tests.py b/ci/run-tests.py
index 11534b3f9..be2a02b3f 100755
--- a/ci/run-tests.py
+++ b/ci/run-tests.py
@@ -73,7 +73,7 @@ with open(test_init_file, 'w') as f:
     f.write('''
     devel/dump-rpc dfhack-rpc.txt
     :lua dfhack.internal.addScriptPath(dfhack.getHackPath())
-    test --resume --modes=none,title "lua scr.breakdown_level=df.interface_breakdown_types.%s"
+    test --resume -- lua scr.breakdown_level=df.interface_breakdown_types.%s
     ''' % ('NONE' if args.no_quit else 'QUIT'))
 
 test_config_file = 'test_config.json'