diff --git a/.circleci-matrix.yml b/.circleci-matrix.yml
index 00f465c..531c9ae 100644
--- a/.circleci-matrix.yml
+++ b/.circleci-matrix.yml
@@ -14,7 +14,7 @@ env:
   - IMAGE=windows-x86
 command:
   - |
-    if [[ $STEP == "test" ]]; then
+    if [[ $STEP == "dependencies" ]]; then
       if [[ $CIRCLE_NODE_INDEX == 0 ]]; then
         if [[ ! -f ~/BASE_AVAILABLE ]]; then
           if [[ -e ~/docker/base.tar ]]; then time docker load -i ~/docker/base.tar; fi
@@ -42,6 +42,8 @@ command:
           echo "Base image already downloaded"
         fi
       fi
+    fi
+    if [[ $STEP == "test" ]]; then
       if [[ -e ~/docker/$IMAGE.tar ]]; then time docker load -i ~/docker/$IMAGE.tar; fi
       time docker pull dockcross/$IMAGE
       time docker load -i ~/docker/base.tar
diff --git a/circle.yml b/circle.yml
index 912fcc5..743fc78 100644
--- a/circle.yml
+++ b/circle.yml
@@ -17,6 +17,10 @@ dependencies:
 
 test:
   override:
+    - circleci-matrix:
+        parallel: true
+        environment:
+          STEP: dependencies
     - circleci-matrix:
         parallel: true
         timeout: 3000