diff --git a/test/conftest.py b/test/fluent_api/conftest.py
similarity index 98%
rename from test/conftest.py
rename to test/fluent_api/conftest.py
index 63c0d43..ced1a94 100644
--- a/test/conftest.py
+++ b/test/fluent_api/conftest.py
@@ -4,7 +4,7 @@
 from unittest.mock import MagicMock
 
 sys.path.insert(0,
-                os.path.abspath(os.path.join(os.path.dirname(__file__), '..')))
+                os.path.abspath(os.path.join(os.path.dirname(__file__), '../..')))
 
 import notecard  # noqa: E402
 
diff --git a/test/test_card.py b/test/fluent_api/test_card.py
similarity index 100%
rename from test/test_card.py
rename to test/fluent_api/test_card.py
diff --git a/test/test_env.py b/test/fluent_api/test_env.py
similarity index 100%
rename from test/test_env.py
rename to test/fluent_api/test_env.py
diff --git a/test/test_file.py b/test/fluent_api/test_file.py
similarity index 100%
rename from test/test_file.py
rename to test/fluent_api/test_file.py
diff --git a/test/test_hub.py b/test/fluent_api/test_hub.py
similarity index 100%
rename from test/test_hub.py
rename to test/fluent_api/test_hub.py
diff --git a/test/test_note.py b/test/fluent_api/test_note.py
similarity index 100%
rename from test/test_note.py
rename to test/fluent_api/test_note.py