diff --git a/src/Script.sol b/src/Script.sol
index fb612ef1..94e75f6c 100644
--- a/src/Script.sol
+++ b/src/Script.sol
@@ -21,7 +21,7 @@ import {VmSafe} from "./Vm.sol";
 import {ScriptBase} from "./Base.sol";
 
 // ⭐️ SCRIPT
-abstract contract Script is StdChains, StdCheatsSafe, StdUtils, ScriptBase {
+abstract contract Script is ScriptBase, StdChains, StdCheatsSafe, StdUtils {
     // Note: IS_SCRIPT() must return true.
     bool public IS_SCRIPT = true;
 }
diff --git a/src/Test.sol b/src/Test.sol
index 40c00640..743c1834 100644
--- a/src/Test.sol
+++ b/src/Test.sol
@@ -27,8 +27,7 @@ import {TestBase} from "./Base.sol";
 import {DSTest} from "ds-test/test.sol";
 
 // ⭐️ TEST
-// Note: DSTest and any contracts that inherit it must be inherited first, https://github.com/foundry-rs/forge-std/pull/241
-abstract contract Test is DSTest, StdAssertions, StdChains, StdCheats, StdInvariant, StdUtils, TestBase {
+abstract contract Test is TestBase, DSTest, StdAssertions, StdChains, StdCheats, StdInvariant, StdUtils {
 // Note: IS_TEST() must return true.
 // Note: Must have failure system, https://github.com/dapphub/ds-test/blob/cd98eff28324bfac652e63a239a60632a761790b/src/test.sol#L39-L76.
 }