diff --git a/projects/tentacles/test/python/test_store.py b/projects/tentacles/test/python/test_store.py
new file mode 100644
index 0000000..8702d81
--- /dev/null
+++ b/projects/tentacles/test/python/test_store.py
@@ -0,0 +1,19 @@
+#!/usr/bin/env python3
+
+from tentacles.store import Store
+
+
+def test_store_initializes(store: Store):
+    assert isinstance(store, Store)
+
+
+def test_store_savepoint(store: Store):
+    obj = store.savepoint()
+
+    assert hasattr(obj, "__enter__")
+    assert hasattr(obj, "__exit__")
+
+    flag = False
+    with obj:
+        flag = True
+    assert flag
diff --git a/projects/tentacles/test/python/test_store_users.py b/projects/tentacles/test/python/test_store_users.py
index ebd57f5..c091fe0 100644
--- a/projects/tentacles/test/python/test_store_users.py
+++ b/projects/tentacles/test/python/test_store_users.py
@@ -3,22 +3,6 @@
 from tentacles.store import Store
 
 
-def test_store_initializes(store: Store):
-    assert isinstance(store, Store)
-
-
-def test_store_savepoint(store: Store):
-    obj = store.savepoint()
-
-    assert hasattr(obj, "__enter__")
-    assert hasattr(obj, "__exit__")
-
-    flag = False
-    with obj:
-        flag = True
-    assert flag
-
-
 def test_mkuser(store: Store, username_testy, password_testy):
     res = store.try_create_user(
         username=username_testy, email=username_testy, password=password_testy