diff --git a/run_tests.sh b/run_tests.sh
index f13bd41..a21a957 100644
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -8,5 +8,12 @@ for f in `ls tests/*.py`; do
 		exit
 	fi
 done
+
+for f in `ls tests/store/*.py`; do
+	python $f
+	if [ $? -gt 0 ]; then
+		exit
+	fi
+done
 set +x
 set +e
diff --git a/tests/test_fs.py b/tests/store/test_1_fs.py
similarity index 100%
rename from tests/test_fs.py
rename to tests/store/test_1_fs.py
diff --git a/tests/test_rocksdb.py b/tests/store/test_rocksdb.py
similarity index 100%
rename from tests/test_rocksdb.py
rename to tests/store/test_rocksdb.py