diff --git a/TestVectors/all_fips_202.txt b/TestVectors/all_fips_202.txt
new file mode 100644
index 00000000..e7c08c7d
--- /dev/null
+++ b/TestVectors/all_fips_202.txt
@@ -0,0 +1,38 @@
+AlgorithmType: FileList
+Name: all.txt collection
+Test: TestVectors/tea.txt
+Test: TestVectors/wake.txt
+Test: TestVectors/camellia.txt
+Test: TestVectors/shacal2.txt
+Test: TestVectors/ttmac.txt
+Test: TestVectors/whrlpool.txt
+Test: TestVectors/dlies.txt
+Test: TestVectors/dsa.txt
+Test: TestVectors/dsa_1363.txt
+Test: TestVectors/dsa_rfc6979.txt
+#Test: TestVectors/ecdsa_rfc6979.txt
+Test: TestVectors/esign.txt
+Test: TestVectors/hmac.txt
+Test: TestVectors/nr.txt
+Test: TestVectors/rsa_oaep.txt
+Test: TestVectors/rsa_pkcs1_1_5.txt
+Test: TestVectors/rsa_pss.txt
+Test: TestVectors/rw.txt
+Test: TestVectors/seal.txt
+Test: TestVectors/sha.txt
+#Test: TestVectors/sha3.txt
+Test: TestVectors/sha3_fips_202.txt
+Test: TestVectors/panama.txt
+Test: TestVectors/aes.txt
+Test: TestVectors/salsa.txt
+Test: TestVectors/chacha.txt
+Test: TestVectors/vmac.txt
+Test: TestVectors/sosemanuk.txt
+Test: TestVectors/ccm.txt
+Test: TestVectors/gcm.txt
+Test: TestVectors/cmac.txt
+Test: TestVectors/eax.txt
+Test: TestVectors/mars.txt
+Test: TestVectors/blake2s.txt
+Test: TestVectors/blake2b.txt
+Test: TestVectors/hkdf.txt
diff --git a/test.cpp b/test.cpp
index bde24f8e..d6c9fab4 100644
--- a/test.cpp
+++ b/test.cpp
@@ -281,6 +281,12 @@ int CRYPTOPP_API main(int argc, char *argv[])
 		{
 			// TestDataFile() adds CRYPTOPP_DATA_DIR as required
 			std::string fname = (argv[2] ? argv[2] : "all");
+#if defined(CRYPTOPP_USE_FIPS_202_SHA3)
+			if (fname == "sha3")
+				fname = "sha3_fips_202";
+			if (fname == "all")
+				fname = "all_fips_202";
+#endif
 			if (fname.find(".txt") == std::string::npos)
 				fname = "TestVectors/" + fname + ".txt";