diff --git a/CMakeLists.txt b/CMakeLists.txt
index 86beaea80..4edb01aa5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -144,7 +144,5 @@ if (HAVE_OPM_DATA)
                              $<TARGET_FILE:flow> ${OPM_DATA_ROOT}/spe1/SPE1CASE2.DATA ${OPM_DATA_ROOT}/spe1/SPE1CASE2_RESTART.DATA )
     endif()
 
-    include (${CMAKE_CURRENT_SOURCE_DIR}/compareECLFiles.cmake)
-    
-
+   include (${CMAKE_CURRENT_SOURCE_DIR}/compareECLFiles.cmake)
 endif()
diff --git a/compareECLFiles.cmake b/compareECLFiles.cmake
index bef9faf22..36a4bb3e5 100644
--- a/compareECLFiles.cmake
+++ b/compareECLFiles.cmake
@@ -1,29 +1,29 @@
 # Set absolute tolerance to be used for testing
 set(abs_tol 2e-2)
 set(rel_tol 1e-5)
+
 # Define some paths
-set(RESULT_PATH ${PROJECT_BINARY_DIR}/tests/results)
-# Create directory to store upscaling results in
+set(BASE_RESULT_PATH ${PROJECT_BINARY_DIR}/tests/results)
 
 ###########################################################################
-# TEST: compareECLFiles 
+# TEST: compareECLFiles
 ###########################################################################
 
-# Input: 
-#   - casename: basename (no extension) 
+# Input:
+#   - casename: basename (no extension)
 #
 macro (add_test_compareECLFiles casename filename)
-  
+
+  set(RESULT_PATH ${BASE_RESULT_PATH}/${casename})
   # Add test that runs flow and outputs the results to file
   opm_add_test(compareECLFiles_${filename} NO_COMPILE
-               EXE_NAME flow    
-	       DRIVER_ARGS ${OPM_DATA_ROOT}/${casename} ${RESULT_PATH}
+               EXE_NAME flow
+               DRIVER_ARGS ${OPM_DATA_ROOT}/${casename} ${RESULT_PATH}
                            ${CMAKE_BINARY_DIR}/bin
                            ${filename}
                            ${abs_tol} ${rel_tol}
-			   ${SUMMARY_REGRESSION_TEST_COMMAND} 
-			   ${RESTART_REGRESSION_TEST_COMMAND} 
-			   ${INIT_REGRESSION_TEST_COMMAND} 
+                           ${COMPARE_SUMMARY_COMMAND}
+                           ${COMPARE_ECL_COMMAND}
                TEST_ARGS ${OPM_DATA_ROOT}/${casename}/${filename}.DATA )
 endmacro (add_test_compareECLFiles)
 
@@ -32,8 +32,8 @@ if(NOT TARGET test-suite)
   add_custom_target(test-suite)
 endif()
 
-
 opm_set_test_driver(${PROJECT_SOURCE_DIR}/tests/run-regressionTest.sh "")
 
-add_test_compareECLFiles(spe9 SPE9_CP)
-
+add_test_compareECLFiles(spe1 SPE1CASE2)
+add_test_compareECLFiles(spe3 SPE3CASE1)
+add_test_compareECLFiles(spe9 SPE9_CP_SHORT)
diff --git a/tests/run-regressionTest.sh b/tests/run-regressionTest.sh
index 5b3cf1162..c6b5bd725 100755
--- a/tests/run-regressionTest.sh
+++ b/tests/run-regressionTest.sh
@@ -7,23 +7,23 @@ BINPATH="$3"
 FILENAME="$4"
 ABS_TOL="$5"
 REL_TOL="$6"
-SUMMARY_REGRESSION_TEST_COMMAND="$7"
-RESTART_REGRESSION_TEST_COMMAND="$8"
-INIT_REGRESSION_TEST_COMMAND="$9"
-EXE_NAME="${10}"
-shift 10
+COMPARE_SUMMARY_COMMAND="$7"
+COMPARE_ECL_COMMAND="$8"
+EXE_NAME="${9}"
+shift 9
 TEST_ARGS="$@"
 
-
-rm -Rf  ${RESULT_PATH};
+rm -Rf  ${RESULT_PATH}
 mkdir -p ${RESULT_PATH}
 cd ${RESULT_PATH}
 ${BINPATH}/${EXE_NAME} ${TEST_ARGS}
 cd ..
 
-${SUMMARY_REGRESSION_TEST_COMMAND} ${RESULT_PATH}/${FILENAME} ${INPUT_DATA_PATH}/opm-simulation-reference/${FILENAME} ${ABS_TOL} ${REL_TOL} 
+${COMPARE_SUMMARY_COMMAND} -r ${RESULT_PATH}/${FILENAME} ${INPUT_DATA_PATH}/opm-simulation-reference/${FILENAME} ${ABS_TOL} ${REL_TOL}
+
+${COMPARE_ECL_COMMAND}  ${RESULT_PATH}/${FILENAME} ${INPUT_DATA_PATH}/opm-simulation-reference/${FILENAME} ${ABS_TOL} ${REL_TOL}
+
+${COMPARE_ECL_COMMAND} -t INIT ${RESULT_PATH}/${FILENAME} ${INPUT_DATA_PATH}/opm-simulation-reference/${FILENAME} ${ABS_TOL} ${REL_TOL}
 
-${RESTART_REGRESSION_TEST_COMMAND} ${RESULT_PATH}/${FILENAME} ${INPUT_DATA_PATH}/opm-simulation-reference/${FILENAME} ${ABS_TOL} ${REL_TOL} 
 
-${INIT_REGRESSION_TEST_COMMAND} ${RESULT_PATH}/${FILENAME} ${INPUT_DATA_PATH}/opm-simulation-reference/${FILENAME} ${ABS_TOL} ${REL_TOL}