diff --git a/ci/previous_results/es_host_amdgpu/deqp_gl30/results.txt b/ci/previous_results/archived/es_host_amdgpu/deqp_gl30/results.txt
similarity index 100%
rename from ci/previous_results/es_host_amdgpu/deqp_gl30/results.txt
rename to ci/previous_results/archived/es_host_amdgpu/deqp_gl30/results.txt
diff --git a/ci/previous_results/es_host_amdgpu/deqp_gl31/results.txt b/ci/previous_results/archived/es_host_amdgpu/deqp_gl31/results.txt
similarity index 100%
rename from ci/previous_results/es_host_amdgpu/deqp_gl31/results.txt
rename to ci/previous_results/archived/es_host_amdgpu/deqp_gl31/results.txt
diff --git a/ci/previous_results/es_host_amdgpu/deqp_gl32/results.txt b/ci/previous_results/archived/es_host_amdgpu/deqp_gl32/results.txt
similarity index 100%
rename from ci/previous_results/es_host_amdgpu/deqp_gl32/results.txt
rename to ci/previous_results/archived/es_host_amdgpu/deqp_gl32/results.txt
diff --git a/ci/previous_results/es_host_amdgpu/deqp_gles2/results.txt b/ci/previous_results/archived/es_host_amdgpu/deqp_gles2/results.txt
similarity index 100%
rename from ci/previous_results/es_host_amdgpu/deqp_gles2/results.txt
rename to ci/previous_results/archived/es_host_amdgpu/deqp_gles2/results.txt
diff --git a/ci/previous_results/es_host_amdgpu/deqp_gles3/results.txt b/ci/previous_results/archived/es_host_amdgpu/deqp_gles3/results.txt
similarity index 100%
rename from ci/previous_results/es_host_amdgpu/deqp_gles3/results.txt
rename to ci/previous_results/archived/es_host_amdgpu/deqp_gles3/results.txt
diff --git a/ci/previous_results/es_host_amdgpu/deqp_gles31/results.txt b/ci/previous_results/archived/es_host_amdgpu/deqp_gles31/results.txt
similarity index 100%
rename from ci/previous_results/es_host_amdgpu/deqp_gles31/results.txt
rename to ci/previous_results/archived/es_host_amdgpu/deqp_gles31/results.txt
diff --git a/ci/previous_results/es_host_i915/deqp_gl30/results.txt b/ci/previous_results/archived/es_host_i915/deqp_gl30/results.txt
similarity index 100%
rename from ci/previous_results/es_host_i915/deqp_gl30/results.txt
rename to ci/previous_results/archived/es_host_i915/deqp_gl30/results.txt
diff --git a/ci/previous_results/es_host_i915/deqp_gl31/results.txt b/ci/previous_results/archived/es_host_i915/deqp_gl31/results.txt
similarity index 100%
rename from ci/previous_results/es_host_i915/deqp_gl31/results.txt
rename to ci/previous_results/archived/es_host_i915/deqp_gl31/results.txt
diff --git a/ci/previous_results/es_host_i915/deqp_gl32/results.txt b/ci/previous_results/archived/es_host_i915/deqp_gl32/results.txt
similarity index 100%
rename from ci/previous_results/es_host_i915/deqp_gl32/results.txt
rename to ci/previous_results/archived/es_host_i915/deqp_gl32/results.txt
diff --git a/ci/previous_results/es_host_i915/deqp_gles2/results.txt b/ci/previous_results/archived/es_host_i915/deqp_gles2/results.txt
similarity index 100%
rename from ci/previous_results/es_host_i915/deqp_gles2/results.txt
rename to ci/previous_results/archived/es_host_i915/deqp_gles2/results.txt
diff --git a/ci/previous_results/es_host_i915/deqp_gles3/results.txt b/ci/previous_results/archived/es_host_i915/deqp_gles3/results.txt
similarity index 100%
rename from ci/previous_results/es_host_i915/deqp_gles3/results.txt
rename to ci/previous_results/archived/es_host_i915/deqp_gles3/results.txt
diff --git a/ci/previous_results/es_host_i915/deqp_gles31/results.txt b/ci/previous_results/archived/es_host_i915/deqp_gles31/results.txt
similarity index 100%
rename from ci/previous_results/es_host_i915/deqp_gles31/results.txt
rename to ci/previous_results/archived/es_host_i915/deqp_gles31/results.txt
diff --git a/ci/previous_results/es_host_i915/piglit_gles2/results.txt b/ci/previous_results/archived/es_host_i915/piglit_gles2/results.txt
similarity index 100%
rename from ci/previous_results/es_host_i915/piglit_gles2/results.txt
rename to ci/previous_results/archived/es_host_i915/piglit_gles2/results.txt
diff --git a/ci/previous_results/es_host_i915/piglit_gles3/results.txt b/ci/previous_results/archived/es_host_i915/piglit_gles3/results.txt
similarity index 100%
rename from ci/previous_results/es_host_i915/piglit_gles3/results.txt
rename to ci/previous_results/archived/es_host_i915/piglit_gles3/results.txt
diff --git a/ci/previous_results/es_host_llvmpipe/deqp_gles2/results.txt b/ci/previous_results/archived/es_host_llvmpipe/deqp_gles2/results.txt
similarity index 100%
rename from ci/previous_results/es_host_llvmpipe/deqp_gles2/results.txt
rename to ci/previous_results/archived/es_host_llvmpipe/deqp_gles2/results.txt
diff --git a/ci/previous_results/es_host_llvmpipe/piglit_gles2/results.txt b/ci/previous_results/archived/es_host_llvmpipe/piglit_gles2/results.txt
similarity index 100%
rename from ci/previous_results/es_host_llvmpipe/piglit_gles2/results.txt
rename to ci/previous_results/archived/es_host_llvmpipe/piglit_gles2/results.txt
diff --git a/ci/previous_results/es_host_llvmpipe/piglit_gles3/results.txt b/ci/previous_results/archived/es_host_llvmpipe/piglit_gles3/results.txt
similarity index 100%
rename from ci/previous_results/es_host_llvmpipe/piglit_gles3/results.txt
rename to ci/previous_results/archived/es_host_llvmpipe/piglit_gles3/results.txt
diff --git a/ci/previous_results/gl_host_amdgpu/deqp_gl30/results.txt b/ci/previous_results/archived/gl_host_amdgpu/deqp_gl30/results.txt
similarity index 100%
rename from ci/previous_results/gl_host_amdgpu/deqp_gl30/results.txt
rename to ci/previous_results/archived/gl_host_amdgpu/deqp_gl30/results.txt
diff --git a/ci/previous_results/gl_host_amdgpu/deqp_gl31/results.txt b/ci/previous_results/archived/gl_host_amdgpu/deqp_gl31/results.txt
similarity index 100%
rename from ci/previous_results/gl_host_amdgpu/deqp_gl31/results.txt
rename to ci/previous_results/archived/gl_host_amdgpu/deqp_gl31/results.txt
diff --git a/ci/previous_results/gl_host_amdgpu/deqp_gl32/results.txt b/ci/previous_results/archived/gl_host_amdgpu/deqp_gl32/results.txt
similarity index 100%
rename from ci/previous_results/gl_host_amdgpu/deqp_gl32/results.txt
rename to ci/previous_results/archived/gl_host_amdgpu/deqp_gl32/results.txt
diff --git a/ci/previous_results/gl_host_amdgpu/deqp_gles2/results.txt b/ci/previous_results/archived/gl_host_amdgpu/deqp_gles2/results.txt
similarity index 100%
rename from ci/previous_results/gl_host_amdgpu/deqp_gles2/results.txt
rename to ci/previous_results/archived/gl_host_amdgpu/deqp_gles2/results.txt
diff --git a/ci/previous_results/gl_host_amdgpu/deqp_gles3/results.txt b/ci/previous_results/archived/gl_host_amdgpu/deqp_gles3/results.txt
similarity index 100%
rename from ci/previous_results/gl_host_amdgpu/deqp_gles3/results.txt
rename to ci/previous_results/archived/gl_host_amdgpu/deqp_gles3/results.txt
diff --git a/ci/previous_results/gl_host_amdgpu/deqp_gles31/results.txt b/ci/previous_results/archived/gl_host_amdgpu/deqp_gles31/results.txt
similarity index 100%
rename from ci/previous_results/gl_host_amdgpu/deqp_gles31/results.txt
rename to ci/previous_results/archived/gl_host_amdgpu/deqp_gles31/results.txt
diff --git a/ci/previous_results/gl_host_i915/deqp_gl30/results.txt b/ci/previous_results/archived/gl_host_i915/deqp_gl30/results.txt
similarity index 100%
rename from ci/previous_results/gl_host_i915/deqp_gl30/results.txt
rename to ci/previous_results/archived/gl_host_i915/deqp_gl30/results.txt
diff --git a/ci/previous_results/gl_host_i915/deqp_gl31/results.txt b/ci/previous_results/archived/gl_host_i915/deqp_gl31/results.txt
similarity index 100%
rename from ci/previous_results/gl_host_i915/deqp_gl31/results.txt
rename to ci/previous_results/archived/gl_host_i915/deqp_gl31/results.txt
diff --git a/ci/previous_results/gl_host_i915/deqp_gl32/results.txt b/ci/previous_results/archived/gl_host_i915/deqp_gl32/results.txt
similarity index 100%
rename from ci/previous_results/gl_host_i915/deqp_gl32/results.txt
rename to ci/previous_results/archived/gl_host_i915/deqp_gl32/results.txt
diff --git a/ci/previous_results/gl_host_i915/deqp_gles2/results.txt b/ci/previous_results/archived/gl_host_i915/deqp_gles2/results.txt
similarity index 100%
rename from ci/previous_results/gl_host_i915/deqp_gles2/results.txt
rename to ci/previous_results/archived/gl_host_i915/deqp_gles2/results.txt
diff --git a/ci/previous_results/gl_host_i915/deqp_gles3/results.txt b/ci/previous_results/archived/gl_host_i915/deqp_gles3/results.txt
similarity index 100%
rename from ci/previous_results/gl_host_i915/deqp_gles3/results.txt
rename to ci/previous_results/archived/gl_host_i915/deqp_gles3/results.txt
diff --git a/ci/previous_results/gl_host_i915/deqp_gles31/results.txt b/ci/previous_results/archived/gl_host_i915/deqp_gles31/results.txt
similarity index 100%
rename from ci/previous_results/gl_host_i915/deqp_gles31/results.txt
rename to ci/previous_results/archived/gl_host_i915/deqp_gles31/results.txt
diff --git a/ci/previous_results/gl_host_i915/piglit_gles2/results.txt b/ci/previous_results/archived/gl_host_i915/piglit_gles2/results.txt
similarity index 100%
rename from ci/previous_results/gl_host_i915/piglit_gles2/results.txt
rename to ci/previous_results/archived/gl_host_i915/piglit_gles2/results.txt
diff --git a/ci/previous_results/gl_host_i915/piglit_gles3/results.txt b/ci/previous_results/archived/gl_host_i915/piglit_gles3/results.txt
similarity index 100%
rename from ci/previous_results/gl_host_i915/piglit_gles3/results.txt
rename to ci/previous_results/archived/gl_host_i915/piglit_gles3/results.txt
diff --git a/ci/previous_results/gl_host_llvmpipe/deqp_gles2/results.txt b/ci/previous_results/archived/gl_host_llvmpipe/deqp_gles2/results.txt
similarity index 100%
rename from ci/previous_results/gl_host_llvmpipe/deqp_gles2/results.txt
rename to ci/previous_results/archived/gl_host_llvmpipe/deqp_gles2/results.txt
diff --git a/ci/previous_results/gl_host_llvmpipe/piglit_gles2/results.txt b/ci/previous_results/archived/gl_host_llvmpipe/piglit_gles2/results.txt
similarity index 100%
rename from ci/previous_results/gl_host_llvmpipe/piglit_gles2/results.txt
rename to ci/previous_results/archived/gl_host_llvmpipe/piglit_gles2/results.txt
diff --git a/ci/previous_results/gl_host_llvmpipe/piglit_gles3/results.txt b/ci/previous_results/archived/gl_host_llvmpipe/piglit_gles3/results.txt
similarity index 100%
rename from ci/previous_results/gl_host_llvmpipe/piglit_gles3/results.txt
rename to ci/previous_results/archived/gl_host_llvmpipe/piglit_gles3/results.txt
diff --git a/ci/run_test_suite.sh b/ci/run_test_suite.sh
index 321e18d..46988c0 100755
--- a/ci/run_test_suite.sh
+++ b/ci/run_test_suite.sh
@@ -297,7 +297,14 @@ create_result_dir()
 
    TEST_PATH=${HOST_GL}_host${HOST_DRIVER}/${TEST_APP}_${TEST_NAME}
    RESULTS_DIR=$VIRGL_PATH/results/${TEST_PATH}
-   PREVIOUS_RESULTS_DIR=$VIRGL_PATH/ci/previous_results/${TEST_PATH}
+
+   if [ $HOST_DRIVER = softpipe ]; then
+      PREVIOUS_RESULTS_DIR=$VIRGL_PATH/ci/previous_results/${TEST_PATH}
+   else
+      echo WARNING: Results are not up-to-date!
+      PREVIOUS_RESULTS_DIR=$VIRGL_PATH/ci/previous_results/archived/${TEST_PATH}
+   fi
+
    IGNORE_TESTS_FILE=$PREVIOUS_RESULTS_DIR/ignore_tests.txt
 
    # Remove comments from test-list