diff --git a/CMakeLists.txt b/CMakeLists.txt
index 01e235409..1c4e24f23 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -128,6 +128,7 @@ opm_add_test(test_gatherdeferredlogger
 )
 
 
+# the production oriented general-purpose ECL simulator
 opm_add_test(flow
   ONLY_COMPILE
   ALWAYS_ENABLE
@@ -150,8 +151,17 @@ add_test(NAME flow__version
 set_tests_properties(flow__version PROPERTIES
                      PASS_REGULAR_EXPRESSION "${${project}_LABEL}")
 
+# the research oriented general-purpose ECL simulator ("ebos" == &ecl
+# &black-&oil &simulator)
+opm_add_test(ebos
+  SOURCES ebos/ebos.cc
+  EXE_NAME ebos
+  ONLY_COMPILE)
 
+if(OPM_GRID_FOUND AND HAVE_ECL_INPUT AND HAVE_ECL_OUTPUT)
+  install(TARGETS ebos DESTINATION bin)
+endif()
 
 include(OpmBashCompletion)
 opm_add_bash_completion(flow)
-
+opm_add_bash_completion(ebos)
diff --git a/CMakeLists_files.cmake b/CMakeLists_files.cmake
index fdcc7d138..2f0620308 100644
--- a/CMakeLists_files.cmake
+++ b/CMakeLists_files.cmake
@@ -50,6 +50,8 @@ list (APPEND MAIN_SOURCE_FILES
 # originally generated with the command:
 # find tests -name '*.cpp' -a ! -wholename '*/not-unit/*' -printf '\t%p\n' | sort
 list (APPEND TEST_SOURCE_FILES
+  tests/test_equil.cc
+  tests/test_ecl_output.cc
   tests/test_blackoil_amg.cpp
   tests/test_convergencereport.cpp
   tests/test_graphcoloring.cpp
@@ -75,6 +77,13 @@ if(MPI_FOUND)
 endif()
 
 list (APPEND TEST_DATA_FILES
+  tests/SUMMARY_DECK_NON_CONSTANT_POROSITY.DATA
+  tests/equil_base.DATA
+  tests/equil_capillary.DATA
+  tests/equil_capillary_overlap.DATA
+  tests/equil_capillary_swatinit.DATA
+  tests/equil_deadfluids.DATA
+  tests/equil_pbvd_and_pdvd.DATA
   tests/VFPPROD1
   tests/VFPPROD2
   tests/msw.data
diff --git a/tests/test_ecl_output.cc b/tests/test_ecl_output.cc
index 9a76a0fa3..1ac3e920f 100644
--- a/tests/test_ecl_output.cc
+++ b/tests/test_ecl_output.cc
@@ -115,7 +115,7 @@ void test_summary();
 void test_summary()
 {
     typedef typename TTAG(TestEclOutputTypeTag) TypeTag;
-    const std::string filename = "data/SUMMARY_DECK_NON_CONSTANT_POROSITY.DATA";
+    const std::string filename = "SUMMARY_DECK_NON_CONSTANT_POROSITY.DATA";
     const std::string casename = "SUMMARY_DECK_NON_CONSTANT_POROSITY";
 
     auto simulator = initSimulator<TypeTag>(filename.data());
diff --git a/tests/test_equil.cc b/tests/test_equil.cc
index 0fca5991a..cb4ff7ccd 100644
--- a/tests/test_equil.cc
+++ b/tests/test_equil.cc
@@ -224,7 +224,7 @@ void test_PhasePressure()
 
     typedef TTAG(TestEquilTypeTag) TypeTag;
     typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
-    auto simulator = initSimulator<TypeTag>("data/equil_base.DATA");
+    auto simulator = initSimulator<TypeTag>("equil_base.DATA");
     initDefaultFluidSystem<TypeTag>();
 
     Ewoms::EQUIL::EquilReg
@@ -255,7 +255,7 @@ void test_CellSubset()
 
     typedef TTAG(TestEquilTypeTag) TypeTag;
     typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
-    auto simulator = initSimulator<TypeTag>("data/equil_base.DATA");
+    auto simulator = initSimulator<TypeTag>("equil_base.DATA");
     const auto& eclipseState = simulator->vanguard().eclState();
     Opm::GridManager gm(eclipseState.getInputGrid());
     const UnstructuredGrid& grid = *(gm.c_grid());
@@ -348,7 +348,7 @@ void test_RegMapping()
 
     typedef TTAG(TestEquilTypeTag) TypeTag;
     typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
-    auto simulator = initSimulator<TypeTag>("data/equil_base.DATA");
+    auto simulator = initSimulator<TypeTag>("equil_base.DATA");
     initDefaultFluidSystem<TypeTag>();
 
     Ewoms::EQUIL::EquilReg region[] =
@@ -429,7 +429,7 @@ void test_DeckAllDead();
 void test_DeckAllDead()
 {
     typedef TTAG(TestEquilTypeTag) TypeTag;
-    auto simulator = initSimulator<TypeTag>("data/equil_deadfluids.DATA");
+    auto simulator = initSimulator<TypeTag>("equil_deadfluids.DATA");
     const auto& eclipseState = simulator->vanguard().eclState();
     Opm::GridManager gm(eclipseState.getInputGrid());
     const UnstructuredGrid& grid = *(gm.c_grid());
@@ -458,7 +458,7 @@ void test_CapillaryInversion()
     typedef typename GET_PROP_TYPE(TypeTag, FluidSystem) FluidSystem;
     typedef typename GET_PROP_TYPE(TypeTag, MaterialLaw) MaterialLaw;
     typedef typename GET_PROP(TypeTag, MaterialLaw)::EclMaterialLawManager MaterialLawManager;
-    auto simulator = initSimulator<TypeTag>("data/equil_capillary.DATA");
+    auto simulator = initSimulator<TypeTag>("equil_capillary.DATA");
 
     // Test the capillary inversion for oil-water.
     const int cell = 0;
@@ -506,7 +506,7 @@ void test_DeckWithCapillary();
 void test_DeckWithCapillary()
 {
     typedef typename TTAG(TestEquilTypeTag) TypeTag;
-    auto simulator = initSimulator<TypeTag>("data/equil_capillary.DATA");
+    auto simulator = initSimulator<TypeTag>("equil_capillary.DATA");
     auto& eclipseState = simulator->vanguard().eclState();
     Opm::GridManager gm(eclipseState.getInputGrid());
     const UnstructuredGrid& grid = *(gm.c_grid());
@@ -545,7 +545,7 @@ void test_DeckWithCapillaryOverlap();
 void test_DeckWithCapillaryOverlap()
 {
     typedef typename TTAG(TestEquilTypeTag) TypeTag;
-    auto simulator = initSimulator<TypeTag>("data/equil_capillary_overlap.DATA");
+    auto simulator = initSimulator<TypeTag>("equil_capillary_overlap.DATA");
     const auto& eclipseState = simulator->vanguard().eclState();
     Opm::GridManager gm(eclipseState.getInputGrid());
     const UnstructuredGrid& grid = *(gm.c_grid());
@@ -605,7 +605,7 @@ void test_DeckWithLiveOil();
 void test_DeckWithLiveOil()
 {
     typedef typename TTAG(TestEquilTypeTag) TypeTag;
-    auto simulator = initSimulator<TypeTag>("data/equil_liveoil.DATA");
+    auto simulator = initSimulator<TypeTag>("equil_liveoil.DATA");
     const auto& eclipseState = simulator->vanguard().eclState();
     Opm::GridManager gm(eclipseState.getInputGrid());
     const UnstructuredGrid& grid = *(gm.c_grid());
@@ -683,7 +683,7 @@ void test_DeckWithLiveGas();
 void test_DeckWithLiveGas()
 {
     typedef typename TTAG(TestEquilTypeTag) TypeTag;
-    auto simulator = initSimulator<TypeTag>("data/equil_livegas.DATA");
+    auto simulator = initSimulator<TypeTag>("equil_livegas.DATA");
     const auto& eclipseState = simulator->vanguard().eclState();
     Opm::GridManager gm(eclipseState.getInputGrid());
     const UnstructuredGrid& grid = *(gm.c_grid());
@@ -764,7 +764,7 @@ void test_DeckWithRSVDAndRVVD();
 void test_DeckWithRSVDAndRVVD()
 {
     typedef typename TTAG(TestEquilTypeTag) TypeTag;
-    auto simulator = initSimulator<TypeTag>("data/equil_rsvd_and_rvvd.DATA");
+    auto simulator = initSimulator<TypeTag>("equil_rsvd_and_rvvd.DATA");
     const auto& eclipseState = simulator->vanguard().eclState();
     Opm::GridManager gm(eclipseState.getInputGrid());
     const UnstructuredGrid& grid = *(gm.c_grid());
@@ -865,7 +865,7 @@ void test_DeckWithPBVDAndPDVD();
 void test_DeckWithPBVDAndPDVD()
 {
     typedef typename TTAG(TestEquilTypeTag) TypeTag;
-    auto simulator = initSimulator<TypeTag>("data/equil_pbvd_and_pdvd.DATA");
+    auto simulator = initSimulator<TypeTag>("equil_pbvd_and_pdvd.DATA");
     const auto& eclipseState = simulator->vanguard().eclState();
     Opm::GridManager gm(eclipseState.getInputGrid());
     const UnstructuredGrid& grid = *(gm.c_grid());
@@ -957,7 +957,7 @@ void test_DeckWithSwatinit()
 {
 #if 0
     typedef typename TTAG(TestEquilTypeTag) TypeTag;
-    auto simulator = initSimulator<TypeTag>("data/equil_capillary_swatinit.DATA");
+    auto simulator = initSimulator<TypeTag>("equil_capillary_swatinit.DATA");
     const auto& eclipseState = simulator->vanguard().eclState();
     Opm::GridManager gm(eclipseState.getInputGrid());
     const UnstructuredGrid& grid = *(gm.c_grid());