diff --git a/Makefile b/Makefile
index 8f104897d..563c46f76 100644
--- a/Makefile
+++ b/Makefile
@@ -165,6 +165,14 @@ test.integration: $(GOTEST)
 test.integration.%: $(GOTEST)
 	$(GOTEST) $(TEST_FLAGS) ./tests/$*/...
 
+# Runs store tests
+test.store: $(GOTEST)
+	$(GOTEST) $(TEST_FLAGS) $(TEST_SUITE_store)
+
+# Runs one suite from store tests
+test.store.%: $(GOTEST)
+	$(GOTEST) $(TEST_FLAGS) ./store/tests/$*/...
+
 # Runs ALL tests
 test.all: $(GOTEST)
 	$(GOTEST) $(TEST_FLAGS) $(TEST_SUITE_all)