diff --git a/CMakeLists.txt b/CMakeLists.txt
index b65ed19db..35795c400 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -297,11 +297,6 @@ if(ENABLE_ECL_INPUT)
       ${PROJECT_BINARY_DIR}/tests
     )
 
-  foreach(test test_EclIO test_EGrid test_ERft test_ERst test_ESmry test_EInit test_ExtESmry)
-    opm_add_test(${test} CONDITION ENABLE_ECL_INPUT AND Boost_UNIT_TEST_FRAMEWORK_FOUND
-                         LIBRARIES ${_libs}
-                         WORKING_DIRECTORY ${PROJECT_BINARY_DIR}/tests)
-  endforeach()
 endif()
 
 # Install build system files and documentation
diff --git a/CMakeLists_files.cmake b/CMakeLists_files.cmake
index e51b422a4..886d7686c 100644
--- a/CMakeLists_files.cmake
+++ b/CMakeLists_files.cmake
@@ -362,6 +362,13 @@ if(ENABLE_ECL_INPUT)
     tests/test_ERsm.cpp
     tests/test_GuideRate.cpp
     tests/test_RestartFileView.cpp
+    tests/test_EclIO.cpp
+    tests/test_EGrid.cpp
+    tests/test_ERft.cpp
+    tests/test_ERst.cpp
+    tests/test_ESmry.cpp
+    tests/test_EInit.cpp
+    tests/test_ExtESmry.cpp
     tests/parser/ACTIONX.cpp
     tests/parser/ADDREGTests.cpp
     tests/parser/AquiferTests.cpp