diff --git a/integrationtests/use_case_simple_presentation/extroot/DataAnalysis/results.md b/integrationtests/test_data/extroot/use_case_simple_presentation/DataAnalysis/results.md
similarity index 100%
rename from integrationtests/use_case_simple_presentation/extroot/DataAnalysis/results.md
rename to integrationtests/test_data/extroot/use_case_simple_presentation/DataAnalysis/results.md
diff --git a/integrationtests/use_case_simple_presentation/extroot/ExperimentalData/data.md b/integrationtests/test_data/extroot/use_case_simple_presentation/ExperimentalData/data.md
similarity index 100%
rename from integrationtests/use_case_simple_presentation/extroot/ExperimentalData/data.md
rename to integrationtests/test_data/extroot/use_case_simple_presentation/ExperimentalData/data.md
diff --git a/integrationtests/use_case_simple_presentation/cfood.yml b/integrationtests/test_data/extroot/use_case_simple_presentation/cfood.yml
similarity index 100%
rename from integrationtests/use_case_simple_presentation/cfood.yml
rename to integrationtests/test_data/extroot/use_case_simple_presentation/cfood.yml
diff --git a/integrationtests/use_case_simple_presentation/identifiables.yml b/integrationtests/test_data/extroot/use_case_simple_presentation/identifiables.yml
similarity index 100%
rename from integrationtests/use_case_simple_presentation/identifiables.yml
rename to integrationtests/test_data/extroot/use_case_simple_presentation/identifiables.yml
diff --git a/integrationtests/use_case_simple_presentation/model.yml b/integrationtests/test_data/extroot/use_case_simple_presentation/model.yml
similarity index 100%
rename from integrationtests/use_case_simple_presentation/model.yml
rename to integrationtests/test_data/extroot/use_case_simple_presentation/model.yml
diff --git a/integrationtests/realworld_example/test_dataset_crawler.py b/integrationtests/test_realworld_example.py
similarity index 97%
rename from integrationtests/realworld_example/test_dataset_crawler.py
rename to integrationtests/test_realworld_example.py
index d5a7d972696d7b9d4a5f60a32e30a961b9075303..28a9469d311b56aa12c35661b8ef66929fae8a8a 100644
--- a/integrationtests/realworld_example/test_dataset_crawler.py
+++ b/integrationtests/test_realworld_example.py
@@ -51,7 +51,7 @@ def rfp(*pathcomponents):
     return os.path.join(os.path.dirname(__file__), *pathcomponents)
 
 
-DATADIR = rfp("..", "test_data", "extroot", "realworld_example")
+DATADIR = rfp("test_data", "extroot", "realworld_example")
 
 
 @pytest.fixture
@@ -74,7 +74,7 @@ def usemodel():
 
 @pytest.fixture
 def clear_database():
-    # TODO(fspreck): Remove once the corresponding avdvancedtools function can
+    # TODO(fspreck): Remove once the corresponding advancedtools function can
     # be used.
     ents = db.execute_query("FIND ENTITY WITH ID>99")
     if ents: