diff --git a/unittests/datamodel_string_properties.schema.json b/unittests/json-schema-models/datamodel_string_properties.schema.json
similarity index 100%
rename from unittests/datamodel_string_properties.schema.json
rename to unittests/json-schema-models/datamodel_string_properties.schema.json
diff --git a/unittests/test_json_schema_model_parser.py b/unittests/test_json_schema_model_parser.py
index e65bf998772387ffe8b3bcc7caef29851941b7f1..c8cae46e4d1abcc5dde21ab7e598c1ddde559c58 100644
--- a/unittests/test_json_schema_model_parser.py
+++ b/unittests/test_json_schema_model_parser.py
@@ -22,7 +22,8 @@ import os
 import caosdb as db
 from caosadvancedtools.models.parser import parse_model_from_json_schema
 
-FILEPATH = os.path.dirname(os.path.abspath(__file__))
+FILEPATH = os.path.join(os.path.dirname(
+    os.path.abspath(__file__)), 'json-schema-models')
 
 
 def test_rt_with_string_properties():
@@ -38,9 +39,9 @@ def test_rt_with_string_properties():
     assert dataset_rt.description == ""
     assert len(dataset_rt.get_properties()) == 3
 
-    assert dataset_rt.get_property("title") != None
-    assert dataset_rt.get_property("campaign") != None
-    assert dataset_rt.get_property("method") != None
+    assert dataset_rt.get_property("title") is not None
+    assert dataset_rt.get_property("campaign") is not None
+    assert dataset_rt.get_property("method") is not None
 
     title_prop = dataset_rt.get_property("title")
     assert title_prop.datatype == db.TEXT