diff --git a/src/test/app/XahauGenesis_test.cpp b/src/test/app/XahauGenesis_test.cpp
index 3c409a36a..ce8a3c115 100644
--- a/src/test/app/XahauGenesis_test.cpp
+++ b/src/test/app/XahauGenesis_test.cpp
@@ -3968,8 +3968,8 @@ struct XahauGenesis_test : public beast::unit_test::suite
         using namespace std::chrono_literals;
         testcase("test claim reward valid without unl report");
 
-        Env env{
-            *this, envconfig(), supported_amendments() - featureXahauGenesis};
+        Env env{*this, envconfig(), features - featureXahauGenesis};
+        bool const has240819 = env.current()->rules().enabled(fix240819);
 
         double const rateDrops = 0.00333333333 * 1'000'000;
         STAmount const feesXRP = XRP(1);
@@ -4050,7 +4050,12 @@ struct XahauGenesis_test : public beast::unit_test::suite
         // validate account fields
         STAmount const postUser = preUser + netReward;
         BEAST_EXPECT(expectAccountFields(
-            env, user, preLedger, preLedger + 1, postUser, preTime));
+            env,
+            user,
+            preLedger,
+            preLedger + 1,
+            has240819 ? (preUser - feesXRP) : postUser,
+            preTime));
 
         env(claimReward(user, env.master), fee(feesXRP), ter(tecHOOK_REJECTED));
         env.close();
@@ -4095,7 +4100,12 @@ struct XahauGenesis_test : public beast::unit_test::suite
         // validate account fields
         STAmount const postUser1 = preUser1 + netReward1;
         BEAST_EXPECT(expectAccountFields(
-            env, user, preLedger1, preLedger1 + 1, postUser1, preTime1));
+            env,
+            user,
+            preLedger1,
+            preLedger1 + 1,
+            has240819 ? (preUser1 - feesXRP) : postUser1,
+            preTime1));
     }
 
     void
@@ -4219,8 +4229,14 @@ struct XahauGenesis_test : public beast::unit_test::suite
 
         // validate account fields
         STAmount const postUser = preUser + netReward;
+        bool const has240819 = env.current()->rules().enabled(fix240819);
         BEAST_EXPECT(expectAccountFields(
-            env, user, preLedger, preLedger + 1, postUser, preTime));
+            env,
+            user,
+            preLedger,
+            preLedger + 1,
+            has240819 ? (preUser - feesXRP) : postUser,
+            preTime));
     }
 
     void
@@ -4352,10 +4368,15 @@ struct XahauGenesis_test : public beast::unit_test::suite
             // validate account fields
             STAmount const postAlice = preAlice + netReward + l1Reward;
             bool const boolResult = withXahauV1 ? true : false;
+            bool const has240819 = env.current()->rules().enabled(fix240819);
             BEAST_EXPECT(
                 expectAccountFields(
-                    env, alice, preLedger, preLedger + 1, postAlice, preTime) ==
-                boolResult);
+                    env,
+                    alice,
+                    preLedger,
+                    preLedger + 1,
+                    has240819 ? (preAlice - feesXRP) : postAlice,
+                    preTime) == boolResult);
         }
     }
 
@@ -4367,6 +4388,7 @@ struct XahauGenesis_test : public beast::unit_test::suite
         testcase("test claim reward optin optout");
 
         Env env{*this, envconfig(), features - featureXahauGenesis};
+        bool const has240819 = env.current()->rules().enabled(fix240819);
 
         double const rateDrops = 0.00333333333 * 1'000'000;
         STAmount const feesXRP = XRP(1);
@@ -4436,7 +4458,12 @@ struct XahauGenesis_test : public beast::unit_test::suite
         // validate account fields
         STAmount const postUser = preUser + netReward;
         BEAST_EXPECT(expectAccountFields(
-            env, user, preLedger, preLedger + 1, postUser, preTime));
+            env,
+            user,
+            preLedger,
+            preLedger + 1,
+            has240819 ? (preUser - feesXRP) : postUser,
+            preTime));
 
         // opt out of claim rewards
         env(claimReward(user, std::nullopt, 1), fee(feesXRP), ter(tesSUCCESS));
@@ -4461,7 +4488,7 @@ struct XahauGenesis_test : public beast::unit_test::suite
             user,
             preLedger1,
             preLedger1 + 1,
-            env.balance(user),
+            has240819 ? (env.balance(user) + feesXRP) : env.balance(user),
             preTime1));
     }
 
@@ -4543,8 +4570,14 @@ struct XahauGenesis_test : public beast::unit_test::suite
 
         // validate account fields
         STAmount const postUser = preUser + netReward;
+        bool const has240819 = env.current()->rules().enabled(fix240819);
         BEAST_EXPECT(expectAccountFields(
-            env, user, preLedger, preLedger + 1, postUser, preTime));
+            env,
+            user,
+            preLedger,
+            has240819 ? preLedger : preLedger + 1,
+            has240819 ? (preUser - feesXRP) : postUser,
+            preTime));
     }
 
     void
@@ -4618,8 +4651,14 @@ struct XahauGenesis_test : public beast::unit_test::suite
 
         // validate account fields
         STAmount const postUser = preUser + netReward;
+        bool const has240819 = env.current()->rules().enabled(fix240819);
         BEAST_EXPECT(expectAccountFields(
-            env, user, preLedger, preLedger + 1, postUser, preTime));
+            env,
+            user,
+            preLedger,
+            preLedger + 1,
+            has240819 ? (preUser - feesXRP) : postUser,
+            preTime));
     }
 
     void
@@ -4824,13 +4863,13 @@ struct XahauGenesis_test : public beast::unit_test::suite
         Env env{
             *this,
             makeGenesisConfig(
-                supported_amendments() - featureXahauGenesis,
+                features - featureXahauGenesis,
                 21337,
                 "10",
                 "1000000",
                 "200000",
                 0),
-            supported_amendments() - featureXahauGenesis};
+            features - featureXahauGenesis};
 
         STAmount const feesXRP = XRP(1);
 
@@ -4890,8 +4929,7 @@ struct XahauGenesis_test : public beast::unit_test::suite
         using namespace std::chrono_literals;
         testcase("test compound interest over 12 claims");
 
-        Env env{
-            *this, envconfig(), supported_amendments() - featureXahauGenesis};
+        Env env{*this, envconfig(), features - featureXahauGenesis};
 
         double const rateDrops = 0.00333333333 * 1'000'000;
         STAmount const feesXRP = XRP(1);
@@ -4965,8 +5003,14 @@ struct XahauGenesis_test : public beast::unit_test::suite
 
             // validate account fields
             STAmount const postUser = preUser + netReward;
+            bool const has240819 = env.current()->rules().enabled(fix240819);
             BEAST_EXPECT(expectAccountFields(
-                env, user, preLedger, preLedger + 1, postUser, preTime));
+                env,
+                user,
+                preLedger,
+                preLedger + 1,
+                has240819 ? (preUser - feesXRP) : postUser,
+                preTime));
         }
 
         STAmount const endBal = env.balance(user);
@@ -5012,6 +5056,7 @@ struct XahauGenesis_test : public beast::unit_test::suite
         using namespace test::jtx;
         auto const sa = supported_amendments();
         testGovernHookWithFeats(sa);
+        testRewardHookWithFeats(sa - fix240819);
         testRewardHookWithFeats(sa);
     }
 };