diff --git a/components/nvs_flash/test_nvs_host/Makefile b/components/nvs_flash/test_nvs_host/Makefile
index f1f5b52f2..369630494 100644
--- a/components/nvs_flash/test_nvs_host/Makefile
+++ b/components/nvs_flash/test_nvs_host/Makefile
@@ -37,10 +37,10 @@ $(OUTPUT_DIR):
 	mkdir -p $(OUTPUT_DIR)
 
 test: $(TEST_PROGRAM)
-	./$(TEST_PROGRAM)
+	./$(TEST_PROGRAM) -d yes exclude:[long]
 
 long-test: $(TEST_PROGRAM)
-	./$(TEST_PROGRAM) [list],[enumtable],[spi_flash_emu],[nvs],[long]
+	./$(TEST_PROGRAM) -d yes
 
 $(COVERAGE_FILES): $(TEST_PROGRAM) long-test
 
@@ -58,4 +58,4 @@ clean:
 	rm -rf coverage_report/
 	rm -f coverage.info
 
-.PHONY: clean all test
+.PHONY: clean all test long-test
diff --git a/components/nvs_flash/test_nvs_host/test_nvs.cpp b/components/nvs_flash/test_nvs_host/test_nvs.cpp
index c20ea9a27..dd013e24a 100644
--- a/components/nvs_flash/test_nvs_host/test_nvs.cpp
+++ b/components/nvs_flash/test_nvs_host/test_nvs.cpp
@@ -720,7 +720,7 @@ TEST_CASE("can init storage from flash with random contents", "[nvs]")
 }
 
 
-TEST_CASE("nvs api tests, starting with random data in flash", "[nvs][.][long]")
+TEST_CASE("nvs api tests, starting with random data in flash", "[nvs][long]")
 {
     const size_t testIters = 3000;
     int lastPercent = -1;
@@ -984,7 +984,7 @@ TEST_CASE("monkey test", "[nvs][monkey]")
     s_perf << "Monkey test: nErase=" << emu.getEraseOps() << " nWrite=" << emu.getWriteOps() << std::endl;
 }
 
-TEST_CASE("test recovery from sudden poweroff", "[.][long][nvs][recovery][monkey]")
+TEST_CASE("test recovery from sudden poweroff", "[long][nvs][recovery][monkey]")
 {
     std::random_device rd;
     std::mt19937 gen(rd());