diff --git a/CMakeLists.txt b/CMakeLists.txt
index a01e72413..53fde23d5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -431,7 +431,7 @@ add_subdirectory( ifs_samples ) # must come after samples
 
 # ecbuild_dont_pack( DIRS samples DONT_PACK_REGEX "*.grib" )
 ecbuild_dont_pack( DIRS
-     experimental deprecated doxygen confluence tests/tests.ecmwf
+     experimental deprecated doxygen confluence tests/deprecated tests/tests.ecmwf
      config m4 examples/F77 src/deprecated tools/deprecated ifs_samples/grib1_mlgrib2_ieee32
      examples/examples.dev examples/extra examples/deprecated bamboo
      fortran/fortranCtypes tigge/tools share/eccodes  .settings )
diff --git a/tests/tests.ecmwf/chemical.c b/tests/deprecated/chemical.c
similarity index 100%
rename from tests/tests.ecmwf/chemical.c
rename to tests/deprecated/chemical.c
diff --git a/tests/tests.ecmwf/compare.c b/tests/deprecated/compare.c
similarity index 100%
rename from tests/tests.ecmwf/compare.c
rename to tests/deprecated/compare.c
diff --git a/tests/tests.ecmwf/compatibility.c b/tests/deprecated/compatibility.c
similarity index 100%
rename from tests/tests.ecmwf/compatibility.c
rename to tests/deprecated/compatibility.c
diff --git a/tests/tests.ecmwf/compatibility.test b/tests/deprecated/compatibility.test
similarity index 100%
rename from tests/tests.ecmwf/compatibility.test
rename to tests/deprecated/compatibility.test
diff --git a/tests/tests.ecmwf/compatibility_ex.c b/tests/deprecated/compatibility_ex.c
similarity index 100%
rename from tests/tests.ecmwf/compatibility_ex.c
rename to tests/deprecated/compatibility_ex.c
diff --git a/tests/tests.ecmwf/concept b/tests/deprecated/concept
similarity index 100%
rename from tests/tests.ecmwf/concept
rename to tests/deprecated/concept
diff --git a/tests/tests.ecmwf/concept.test b/tests/deprecated/concept.test
similarity index 100%
rename from tests/tests.ecmwf/concept.test
rename to tests/deprecated/concept.test
diff --git a/tests/tests.ecmwf/deserialize.c b/tests/deprecated/deserialize.c
similarity index 100%
rename from tests/tests.ecmwf/deserialize.c
rename to tests/deprecated/deserialize.c
diff --git a/tests/tests.ecmwf/dump.test b/tests/deprecated/dump.test
similarity index 100%
rename from tests/tests.ecmwf/dump.test
rename to tests/deprecated/dump.test
diff --git a/tests/tests.ecmwf/filter b/tests/deprecated/filter
similarity index 100%
rename from tests/tests.ecmwf/filter
rename to tests/deprecated/filter
diff --git a/tests/tests.ecmwf/filter.test b/tests/deprecated/filter.test
similarity index 100%
rename from tests/tests.ecmwf/filter.test
rename to tests/deprecated/filter.test
diff --git a/tests/tests.ecmwf/grib1to2.c b/tests/deprecated/grib1to2.c
similarity index 100%
rename from tests/tests.ecmwf/grib1to2.c
rename to tests/deprecated/grib1to2.c
diff --git a/tests/tests.ecmwf/grib1to2.test b/tests/deprecated/grib1to2.test
similarity index 100%
rename from tests/tests.ecmwf/grib1to2.test
rename to tests/deprecated/grib1to2.test
diff --git a/tests/tests.ecmwf/grib_ls b/tests/deprecated/grib_ls
similarity index 100%
rename from tests/tests.ecmwf/grib_ls
rename to tests/deprecated/grib_ls
diff --git a/tests/tests.ecmwf/grib_ls.test b/tests/deprecated/grib_ls.test
similarity index 100%
rename from tests/tests.ecmwf/grib_ls.test
rename to tests/deprecated/grib_ls.test
diff --git a/tests/tests.ecmwf/gribex b/tests/deprecated/gribex
similarity index 100%
rename from tests/tests.ecmwf/gribex
rename to tests/deprecated/gribex
diff --git a/tests/tests.ecmwf/gribex.test b/tests/deprecated/gribex.test
similarity index 100%
rename from tests/tests.ecmwf/gribex.test
rename to tests/deprecated/gribex.test
diff --git a/tests/tests.ecmwf/memory.c b/tests/deprecated/memory.c
similarity index 100%
rename from tests/tests.ecmwf/memory.c
rename to tests/deprecated/memory.c
diff --git a/tests/tests.ecmwf/memory.test b/tests/deprecated/memory.test
similarity index 100%
rename from tests/tests.ecmwf/memory.test
rename to tests/deprecated/memory.test
diff --git a/tests/tests.ecmwf/packing.c b/tests/deprecated/packing.c
similarity index 100%
rename from tests/tests.ecmwf/packing.c
rename to tests/deprecated/packing.c
diff --git a/tests/tests.ecmwf/packing.test b/tests/deprecated/packing.test
similarity index 100%
rename from tests/tests.ecmwf/packing.test
rename to tests/deprecated/packing.test
diff --git a/tests/tests.ecmwf/request.c b/tests/deprecated/request.c
similarity index 100%
rename from tests/tests.ecmwf/request.c
rename to tests/deprecated/request.c
diff --git a/tests/tests.ecmwf/sample.c b/tests/deprecated/sample.c
similarity index 100%
rename from tests/tests.ecmwf/sample.c
rename to tests/deprecated/sample.c
diff --git a/tests/tests.ecmwf/sample1.c b/tests/deprecated/sample1.c
similarity index 100%
rename from tests/tests.ecmwf/sample1.c
rename to tests/deprecated/sample1.c
diff --git a/tests/tests.ecmwf/serialize.c b/tests/deprecated/serialize.c
similarity index 100%
rename from tests/tests.ecmwf/serialize.c
rename to tests/deprecated/serialize.c
diff --git a/tests/tests.ecmwf/set b/tests/deprecated/set
similarity index 100%
rename from tests/tests.ecmwf/set
rename to tests/deprecated/set
diff --git a/tests/tests.ecmwf/set.test b/tests/deprecated/set.test
similarity index 100%
rename from tests/tests.ecmwf/set.test
rename to tests/deprecated/set.test
diff --git a/tests/tests.ecmwf/set1to2 b/tests/deprecated/set1to2
similarity index 100%
rename from tests/tests.ecmwf/set1to2
rename to tests/deprecated/set1to2
diff --git a/tests/tests.ecmwf/set1to2.test b/tests/deprecated/set1to2.test
similarity index 100%
rename from tests/tests.ecmwf/set1to2.test
rename to tests/deprecated/set1to2.test
diff --git a/tests/tests.ecmwf/skip.t b/tests/deprecated/skip.t
similarity index 100%
rename from tests/tests.ecmwf/skip.t
rename to tests/deprecated/skip.t
diff --git a/tests/tests.ecmwf/test.h b/tests/deprecated/test.h
similarity index 100%
rename from tests/tests.ecmwf/test.h
rename to tests/deprecated/test.h
diff --git a/tests/tests.ecmwf/test.ksh b/tests/deprecated/test.ksh
similarity index 100%
rename from tests/tests.ecmwf/test.ksh
rename to tests/deprecated/test.ksh
diff --git a/tests/tests.ecmwf/tests b/tests/deprecated/tests
similarity index 100%
rename from tests/tests.ecmwf/tests
rename to tests/deprecated/tests
diff --git a/tests/tests.ecmwf/values.c b/tests/deprecated/values.c
similarity index 100%
rename from tests/tests.ecmwf/values.c
rename to tests/deprecated/values.c
diff --git a/tests/tests.ecmwf/values.test b/tests/deprecated/values.test
similarity index 100%
rename from tests/tests.ecmwf/values.test
rename to tests/deprecated/values.test