diff --git a/src/test/app/OversizeMeta_test.cpp b/src/test/app/OversizeMeta_test.cpp
index 578be331804..ae35085d49a 100644
--- a/src/test/app/OversizeMeta_test.cpp
+++ b/src/test/app/OversizeMeta_test.cpp
@@ -61,7 +61,7 @@ class PlumpBook_test : public beast::unit_test::suite
     }
 };
 
-BEAST_DEFINE_TESTSUITE_MANUAL_PRIO(PlumpBook, tx, ripple, 5);
+BEAST_DEFINE_TESTSUITE_MANUAL_PRIO(PlumpBook, app, ripple, 5);
 
 //------------------------------------------------------------------------------
 
@@ -76,7 +76,7 @@ class ThinBook_test : public PlumpBook_test
     }
 };
 
-BEAST_DEFINE_TESTSUITE(ThinBook, tx, ripple);
+BEAST_DEFINE_TESTSUITE(ThinBook, app, ripple);
 
 //------------------------------------------------------------------------------
 
@@ -119,7 +119,7 @@ class OversizeMeta_test : public beast::unit_test::suite
     }
 };
 
-BEAST_DEFINE_TESTSUITE_MANUAL_PRIO(OversizeMeta, tx, ripple, 3);
+BEAST_DEFINE_TESTSUITE_MANUAL_PRIO(OversizeMeta, app, ripple, 3);
 
 //------------------------------------------------------------------------------
 
diff --git a/src/test/basics/DetectCrash_test.cpp b/src/test/basics/DetectCrash_test.cpp
index 87beea6c483..3f02834154d 100644
--- a/src/test/basics/DetectCrash_test.cpp
+++ b/src/test/basics/DetectCrash_test.cpp
@@ -41,7 +41,7 @@ struct DetectCrash_test : public beast::unit_test::suite
     }
 };
 
-BEAST_DEFINE_TESTSUITE_MANUAL(DetectCrash, basics, beast);
+BEAST_DEFINE_TESTSUITE_MANUAL(DetectCrash, basics, ripple);
 
 }  // namespace test
 }  // namespace ripple
diff --git a/src/test/json/MultivarJson_test.cpp b/src/test/json/MultivarJson_test.cpp
index 8cb3a49aff2..89c0a2a5876 100644
--- a/src/test/json/MultivarJson_test.cpp
+++ b/src/test/json/MultivarJson_test.cpp
@@ -287,7 +287,7 @@ struct MultivarJson_test : beast::unit_test::suite
     }
 };
 
-BEAST_DEFINE_TESTSUITE(MultivarJson, ripple_basics, ripple);
+BEAST_DEFINE_TESTSUITE(MultivarJson, json, ripple);
 
 }  // namespace test
 }  // namespace ripple
diff --git a/src/test/jtx/Env_test.cpp b/src/test/jtx/Env_test.cpp
index 6e26a40e25a..6e5dd6b9bd6 100644
--- a/src/test/jtx/Env_test.cpp
+++ b/src/test/jtx/Env_test.cpp
@@ -1019,7 +1019,7 @@ class Env_test : public beast::unit_test::suite
     }
 };
 
-BEAST_DEFINE_TESTSUITE(Env, app, ripple);
+BEAST_DEFINE_TESTSUITE(Env, jtx, ripple);
 
 }  // namespace test
 }  // namespace ripple
diff --git a/src/test/jtx/WSClient_test.cpp b/src/test/jtx/WSClient_test.cpp
index 85440003ba4..40ff9d95edc 100644
--- a/src/test/jtx/WSClient_test.cpp
+++ b/src/test/jtx/WSClient_test.cpp
@@ -45,7 +45,7 @@ class WSClient_test : public beast::unit_test::suite
     }
 };
 
-BEAST_DEFINE_TESTSUITE(WSClient, test, ripple);
+BEAST_DEFINE_TESTSUITE(WSClient, jtx, ripple);
 
 }  // namespace test
 }  // namespace ripple
diff --git a/src/test/rpc/Handler_test.cpp b/src/test/rpc/Handler_test.cpp
index 5160a68aac2..ac26763ebf1 100644
--- a/src/test/rpc/Handler_test.cpp
+++ b/src/test/rpc/Handler_test.cpp
@@ -127,6 +127,6 @@ class Handler_test : public beast::unit_test::suite
     }
 };
 
-BEAST_DEFINE_TESTSUITE_MANUAL(Handler, test, ripple);
+BEAST_DEFINE_TESTSUITE_MANUAL(Handler, rpc, ripple);
 
 }  // namespace ripple::test
diff --git a/src/test/rpc/Status_test.cpp b/src/test/rpc/Status_test.cpp
index 9b6cdfeefe9..36dc6218f27 100644
--- a/src/test/rpc/Status_test.cpp
+++ b/src/test/rpc/Status_test.cpp
@@ -94,7 +94,7 @@ class codeString_test : public beast::unit_test::suite
     }
 };
 
-BEAST_DEFINE_TESTSUITE(codeString, Status, RPC);
+BEAST_DEFINE_TESTSUITE(codeString, rpc, ripple);
 
 class fillJson_test : public beast::unit_test::suite
 {
@@ -218,7 +218,7 @@ class fillJson_test : public beast::unit_test::suite
     }
 };
 
-BEAST_DEFINE_TESTSUITE(fillJson, rpc, RPC);
+BEAST_DEFINE_TESTSUITE(fillJson, rpc, ripple);
 
 }  // namespace RPC
 }  // namespace ripple