diff --git a/src/test/app/Vault_test.cpp b/src/test/app/Vault_test.cpp
index b5a6802506..f1d891d4b7 100644
--- a/src/test/app/Vault_test.cpp
+++ b/src/test/app/Vault_test.cpp
@@ -1,10 +1,30 @@
-#include <test/jtx.h>
 #include <test/jtx/AMM.h>
 #include <test/jtx/AMMTest.h>
 #include <test/jtx/Account.h>
 #include <test/jtx/CaptureLogs.h>
 #include <test/jtx/Env.h>
 #include <test/jtx/TestHelpers.h>
+#include <test/jtx/amount.h>
+#include <test/jtx/credentials.h>
+#include <test/jtx/escrow.h>
+#include <test/jtx/fee.h>
+#include <test/jtx/flags.h>
+#include <test/jtx/mpt.h>
+#include <test/jtx/noop.h>
+#include <test/jtx/offer.h>
+#include <test/jtx/paths.h>
+#include <test/jtx/pay.h>
+#include <test/jtx/permissioned_domains.h>
+#include <test/jtx/rate.h>
+#include <test/jtx/sendmax.h>
+#include <test/jtx/seq.h>
+#include <test/jtx/sig.h>
+#include <test/jtx/tags.h>
+#include <test/jtx/ter.h>
+#include <test/jtx/ticket.h>
+#include <test/jtx/trust.h>
+#include <test/jtx/utility.h>
+#include <test/jtx/vault.h>
 
 #include <xrpl/basics/Number.h>
 #include <xrpl/basics/base_uint.h>
diff --git a/src/test/rpc/AccountObjects_test.cpp b/src/test/rpc/AccountObjects_test.cpp
index c040c0a5f5..775a9aa8bf 100644
--- a/src/test/rpc/AccountObjects_test.cpp
+++ b/src/test/rpc/AccountObjects_test.cpp
@@ -1427,7 +1427,7 @@ public:
         }
 
         // Now sponsor bob's trust line
-        auto const trustId = keylet::line(bob, gw, usd.currency);
+        auto const trustId = keylet::trustLine(bob, gw, usd.currency);
         if (!BEAST_EXPECT(env.le(trustId)))
             return;
 
@@ -1491,7 +1491,7 @@ public:
             env(trust(user, usd(100)));
             env.close();
 
-            auto const trustId = keylet::line(user, issuer, usd.currency);
+            auto const trustId = keylet::trustLine(user, issuer, usd.currency);
             if (!BEAST_EXPECT(env.le(trustId)))
                 return;