diff --git a/Applications/Utils/Tests.cmake b/Applications/Utils/Tests.cmake
index 2c568c8732b9180ca90be08140f36ace7a879efa..99e7e163edd609398a932b45d9c3a92e19d243ba 100644
--- a/Applications/Utils/Tests.cmake
+++ b/Applications/Utils/Tests.cmake
@@ -3,7 +3,7 @@ AddTest(
     NAME MapGeometryToMeshSurface_Ammer
     PATH MeshGeoToolsLib/Ammer/
     EXECUTABLE MapGeometryToMeshSurface
-    EXECUTABLE_ARGS -m Ammer-Homogen100m-Final-TopSurface.vtu -i Ammer-Rivers.gml -o ${PROJECT_BINARY_DIR}/Tests/Data/MeshGeoToolsLib/Ammer/Ammer-Rivers-Mapped.gml
+    EXECUTABLE_ARGS -m Ammer-Homogen100m-Final-TopSurface.vtu -i Ammer-Rivers.gml -o ${Data_BINARY_DIR}/MeshGeoToolsLib/Ammer/Ammer-Rivers-Mapped.gml
     TESTER diff
     REQUIREMENTS NOT OGS_USE_MPI
     DIFF_DATA Ammer-Rivers-Mapped.gml
@@ -13,7 +13,7 @@ AddTest(
     NAME LARGE_MapGeometryToMeshSurface_Bode
     PATH MeshGeoToolsLib/Bode/
     EXECUTABLE MapGeometryToMeshSurface
-    EXECUTABLE_ARGS -m BodeComplex.msh -i BodeEZG_Fliessgewaesser.gml -o ${PROJECT_BINARY_DIR}/Tests/Data/MeshGeoToolsLib/Bode/BodeEZG_Fliessgewaesser-Mapped.gml
+    EXECUTABLE_ARGS -m BodeComplex.msh -i BodeEZG_Fliessgewaesser.gml -o ${Data_BINARY_DIR}/MeshGeoToolsLib/Bode/BodeEZG_Fliessgewaesser-Mapped.gml
     REQUIREMENTS NOT OGS_USE_MPI
     TESTER diff
     DIFF_DATA BodeEZG_Fliessgewaesser-Mapped.gml
@@ -23,7 +23,7 @@ AddTest(
     NAME LARGE_MapGeometryToMeshSurface_Naegelstedt
     PATH MeshGeoToolsLib/Naegelstedt
     EXECUTABLE MapGeometryToMeshSurface
-    EXECUTABLE_ARGS -m SmallTest.vtu -i RiverNetwork.gml -o ${PROJECT_BINARY_DIR}/Tests/Data/MeshGeoToolsLib/Naegelstedt/RiverNetwork-Mapped.gml
+    EXECUTABLE_ARGS -m SmallTest.vtu -i RiverNetwork.gml -o ${Data_BINARY_DIR}/MeshGeoToolsLib/Naegelstedt/RiverNetwork-Mapped.gml
     REQUIREMENTS NOT OGS_USE_MPI
     TESTER diff
     DIFF_DATA RiverNetwork-Mapped.gml
@@ -33,7 +33,7 @@ AddTest(
     NAME postLIE
     PATH LIE/PostProcessing
     EXECUTABLE postLIE
-    EXECUTABLE_ARGS -i single_joint_pcs_0.pvd -o ${PROJECT_BINARY_DIR}/Tests/Data/LIE/PostProcessing/post_single_joint_pcs_0.pvd
+    EXECUTABLE_ARGS -i single_joint_pcs_0.pvd -o ${Data_BINARY_DIR}/LIE/PostProcessing/post_single_joint_pcs_0.pvd
     REQUIREMENTS NOT OGS_USE_MPI
     ABSTOL 1e-14 RELTOL 1e-14
     TESTER vtkdiff
diff --git a/CMakeLists.txt b/CMakeLists.txt
index fbd5bb6b6676a3aae50c4023457be702fad139b5..e12fdbc05fc03012bbbbfe4ffddd327b8eb80e85 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -236,8 +236,8 @@ if (OGS_FATAL_ABORT)
 endif()
 
 if(OGS_BUILD_TESTS)
-    set(Data_SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/Tests/Data CACHE INTERNAL "")
-    set(Data_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/Tests/Data CACHE INTERNAL "")
+    set(Data_SOURCE_DIR ${PROJECT_SOURCE_DIR}/Tests/lfs-data CACHE INTERNAL "")
+    set(Data_BINARY_DIR ${PROJECT_BINARY_DIR}/Tests/lfs-data CACHE INTERNAL "")
 endif()
 
 # Logging level
diff --git a/scripts/cmake/DocumentationSetup.cmake b/scripts/cmake/DocumentationSetup.cmake
index e7bea8c760f3d50e9ea97c3fce9708b3a811e23f..8641f08c58e431247e4c0740c65077d2fc22ed25 100644
--- a/scripts/cmake/DocumentationSetup.cmake
+++ b/scripts/cmake/DocumentationSetup.cmake
@@ -62,7 +62,7 @@ if(DOXYGEN_FOUND)
     add_dependencies(doc internal_pre_doc)
 
     if (doc_use_external_tools)
-        set(data_dir "${PROJECT_SOURCE_DIR}/Tests/Data")
+        set(data_dir "${Data_SOURCE_DIR}")
         add_custom_target(internal_pre_doc_qa_page
             ${BASH_TOOL_PATH}
             "${PROJECT_SOURCE_DIR}/scripts/doc/generate-project-file-doc-qa.sh"
diff --git a/scripts/cmake/test/AddTest.cmake b/scripts/cmake/test/AddTest.cmake
index ab76d7b9dcd7d9be915bb0a8ef656d2184168b38..6a26cccda58706d2caac67b0b69b3547f01e5be3 100644
--- a/scripts/cmake/test/AddTest.cmake
+++ b/scripts/cmake/test/AddTest.cmake
@@ -6,7 +6,7 @@
 #
 # AddTest(
 #   NAME <name of the the test>
-#   PATH <working directory> # relative to SourceDir/Tests/Data
+#   PATH <working directory> # relative to SourceDir/Tests/lfs-data
 #   EXECUTABLE <executable target> # optional, defaults to ogs
 #   EXECUTABLE_ARGS <arguments>
 #   WRAPPER <time|memcheck|callgrind> # optional
@@ -22,7 +22,7 @@
 #
 #   diff-tester
 #     - DIFF_DATA <list of files to diff>
-#       # the given file is compared to a file with the same name from Tests/Data
+#       # the given file is compared to a file with the same name from Tests/lfs-data
 #
 #   vtkdiff-tester
 #     - DIFF_DATA <vtk file> <data array a name> <data array b name>
diff --git a/scripts/cmake/test/Test.cmake b/scripts/cmake/test/Test.cmake
index b8e53062b4d4eb734c974abf40d47899e2f0fd9b..e8cca7467bd6646675a5568b3658f1c490a8eeba 100644
--- a/scripts/cmake/test/Test.cmake
+++ b/scripts/cmake/test/Test.cmake
@@ -78,7 +78,7 @@ add_custom_target(
     DEPENDS ogs vtkdiff ctest-large-cleanup
 )
 set_directory_properties(PROPERTIES
-    ADDITIONAL_MAKE_CLEAN_FILES ${PROJECT_BINARY_DIR}/Tests/Data
+    ADDITIONAL_MAKE_CLEAN_FILES ${Data_BINARY_DIR}
 )
 
 set_target_properties(ctest PROPERTIES FOLDER Testing)
diff --git a/scripts/packaging/archive-testdata.sh b/scripts/packaging/archive-testdata.sh
index 58968224c23f49a962dc6cbb0258fe943dcb56de..8302e3255ecc0a539ef33a675f04e26aec0fc4a4 100644
--- a/scripts/packaging/archive-testdata.sh
+++ b/scripts/packaging/archive-testdata.sh
@@ -1,11 +1,11 @@
 #!/bin/bash
 if [[ $OSTYPE == darwin* ]]; then
-    find ./Tests/Data -not -name "*.md5-stamp" -not -name "*expected*" -not -type d -exec bash -c 'mkdir -p ./tmp/`dirname {}`' \; -exec bash -c 'cp `grealpath {}` ./tmp/{}' \;
+    find ./Tests/lfs-data -not -name "*.md5-stamp" -not -name "*expected*" -not -type d -exec bash -c 'mkdir -p ./tmp/`dirname {}`' \; -exec bash -c 'cp `grealpath {}` ./tmp/{}' \;
 else
-    find ./Tests/Data -not -name "*.md5-stamp" -not -name "*expected*" -not -type d -exec bash -c 'mkdir -p ./tmp/`dirname {}`' \; -exec bash -c 'cp `realpath {}` ./tmp/{}' \;
+    find ./Tests/lfs-data -not -name "*.md5-stamp" -not -name "*expected*" -not -type d -exec bash -c 'mkdir -p ./tmp/`dirname {}`' \; -exec bash -c 'cp `realpath {}` ./tmp/{}' \;
 fi
 pushd . > /dev/null
-cd ./tmp/Tests/Data
+cd ./tmp/Tests/lfs-data
 tar zcf ogs6-data.tar.gz ./*
 mv ogs6-data.tar.gz ../../../
 zip -r -q ogs6-data .
diff --git a/web/content/docs/benchmarks/hydro-component/elder.md b/web/content/docs/benchmarks/hydro-component/elder.md
index d5b44385722f24cf323244fb5e3ef6c2aa1d7da8..bd2a97494e400e550cda6e8a64c73ccbe157d75d 100644
--- a/web/content/docs/benchmarks/hydro-component/elder.md
+++ b/web/content/docs/benchmarks/hydro-component/elder.md
@@ -32,7 +32,7 @@ A comparison of the numerical data is shown in the figure below. The numerical r
 
 {{< img src="../gif/elder.gif" title="Results for numerical (OGS-5 - green, OGS-6 - white) results together with concentration distribution in the domain and mesh resolution for different time steps.">}}
 
-[The project files are here. ](../../../../../Tests/Data/Parabolic/ComponentTransport/elder)
+[The project files are here. ](../../../../../Tests/lfs-data/Parabolic/ComponentTransport/elder)
 
 ## Literature
 
diff --git a/web/content/docs/benchmarks/hydro-component/goswami.md b/web/content/docs/benchmarks/hydro-component/goswami.md
index 442750de3dd6040280c951b016af229ddfc7f2d7..9b340db5f7223d5b5280341caad453404080dd1d 100644
--- a/web/content/docs/benchmarks/hydro-component/goswami.md
+++ b/web/content/docs/benchmarks/hydro-component/goswami.md
@@ -33,7 +33,7 @@ A comparison of numerical and laboratory data is shown in the figure below. The
 
 {{< img src="../goswami.png" title="Results for numerical (OGS5 - green, ogs6 - white) and laboratory data (black squares) together with concentration distribution in the domain and mesh resolution for steady state 1 (see original research paper).">}}
 
-[The project files are here. ](../../../../../Tests/Data/Parabolic/ComponentTransport/gosami)
+[The project files are here. ](../../../../../Tests/lfs-data/Parabolic/ComponentTransport/gosami)
 
 ## Literature
 
diff --git a/web/content/docs/benchmarks/hydro-component/hydro-component.md b/web/content/docs/benchmarks/hydro-component/hydro-component.md
index 381dfe62a4e487254140796e288e3d364a30dbcc..e73488f9fb0df8c530114031e4feb2400fe4f4e1 100644
--- a/web/content/docs/benchmarks/hydro-component/hydro-component.md
+++ b/web/content/docs/benchmarks/hydro-component/hydro-component.md
@@ -33,8 +33,8 @@ Boundary conditions vary on the left side individually for each setup; right sid
 
 Left side boundary conditions for these two setups are pressure $p=0$ and concentration $c=1$. The *Diffusion only* setup results in the final state of the *Diffusion and Storage* setup. For the former, retardation is set to $R=0$, while for the latter, $R=1$.
 
-[The *Diffusion only* project file is here. ](../../../../../Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/ConcentrationDiffusionOnly.prj)
-[The *Diffusion and Storage* project file is here. ](../../../../../Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/ConcentrationDiffusionAndStorage.prj)
+[The *Diffusion only* project file is here. ](../../../../../Tests/lfs-data/Parabolic/ComponentTransport/SimpleSynthetics/ConcentrationDiffusionOnly.prj)
+[The *Diffusion and Storage* project file is here. ](../../../../../Tests/lfs-data/Parabolic/ComponentTransport/SimpleSynthetics/ConcentrationDiffusionAndStorage.prj)
 
 {{< img src="../gif/DiffusionAndStorage.gif" title="*Diffusion and Storage*">}}
 
@@ -42,7 +42,7 @@ Left side boundary conditions for these two setups are pressure $p=0$ and concen
 
 Left side boundary conditions for this setup are pressure $p=1$ and concentration $c=1$.
 
-[The *Diffusion, Storage, and Advection* project file is here. ](../../../../../Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvection.prj)
+[The *Diffusion, Storage, and Advection* project file is here. ](../../../../../Tests/lfs-data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvection.prj)
 
 {{< img src="../gif/DiffusionAndStorageAndAdvection.gif" title="*Diffusion, Storage, and Advection*">}}
 
@@ -50,8 +50,8 @@ Left side boundary conditions for this setup are pressure $p=1$ and concentratio
 
 Left side boundary conditions for these setups are pressure $p=1$ and concentration $c=1$. The latter is once given over the full left side, and in a second setup over half of the left side. Longitudinal and transverse dispersivity is $\alpha_l = 1 m$ and $\alpha_t = 0.1 m$.
 
-[The *Diffusion, Storage, Advection, and Dispersion* project file is here. ](../../../../../Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvectionAndDispersion.prj)
-[The *Diffusion, Storage, Advection, and Dispersion Half* project file is here. ](../../../../../Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvectionAndDispersionHalf.prj)
+[The *Diffusion, Storage, Advection, and Dispersion* project file is here. ](../../../../../Tests/lfs-data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvectionAndDispersion.prj)
+[The *Diffusion, Storage, Advection, and Dispersion Half* project file is here. ](../../../../../Tests/lfs-data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvectionAndDispersionHalf.prj)
 
 {{< img src="../gif/DiffusionAndStorageAndAdvectionAndDispersion.gif" title="*Diffusion, Storage, Advection, and Dispersion*">}}
 {{< img src="../gif/DiffusionAndStorageAndAdvectionAndDispersionHalf.gif" title="*Diffusion, Storage, Advection, and Dispersion Half*">}}
@@ -60,7 +60,7 @@ Left side boundary conditions for these setups are pressure $p=1$ and concentrat
 
 Boundary condition for this setup is pressure $p=0$ for the top left corner and concentration $c=1$ for half of the left side. Relation between concentration and gravity is $\beta_c = 1$.
 
-[The *Diffusion, Storage, Gravity, and Dispersion* project file is here. ](../../../../../Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndGravityAndDispersionHalf.prj)
+[The *Diffusion, Storage, Gravity, and Dispersion* project file is here. ](../../../../../Tests/lfs-data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndGravityAndDispersionHalf.prj)
 
 {{< img src="../gif/DiffusionAndStorageAndGravityAndDispersionHalf.gif" title="*Diffusion, Storage, Gravity, and Dispersion Half*">}}
 
@@ -69,6 +69,6 @@ Boundary condition for this setup is pressure $p=0$ for the top left corner and
 
 Left side boundary conditions for this setup are pressure $p=1$ and concentration $c=1$. Decay rate is $\theta = 0.001 s^{-1}$.
 
-[The *Diffusion, Storage, Advection, and Decay* project file is here. ](../../../../../Tests/Data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvectionAndDecay.prj)
+[The *Diffusion, Storage, Advection, and Decay* project file is here. ](../../../../../Tests/lfs-data/Parabolic/ComponentTransport/SimpleSynthetics/DiffusionAndStorageAndAdvectionAndDecay.prj)
 
 {{< img src="../gif/DiffusionAndStorageAndAdvectionAndDecay.gif" title="*Diffusion, Storage, Advection, and Decay*">}}