diff --git a/test/foundry/integration/BaseIntegration.sol b/test/foundry/integration/BaseIntegration.t.sol
similarity index 99%
rename from test/foundry/integration/BaseIntegration.sol
rename to test/foundry/integration/BaseIntegration.t.sol
index 841a12c03..eef819c0f 100644
--- a/test/foundry/integration/BaseIntegration.sol
+++ b/test/foundry/integration/BaseIntegration.t.sol
@@ -17,7 +17,7 @@ import { IP } from "contracts/lib/IP.sol";
 // test
 import { MockRoyaltyPolicyLS } from "test/foundry/mocks/policy/MockRoyaltyPolicyLS.sol";
 import { MockERC721 } from "test/foundry/mocks/token/MockERC721.sol";
-import { BaseTest } from "test/foundry/utils/BaseTest.sol";
+import { BaseTest } from "test/foundry/utils/BaseTest.t.sol";
 
 contract BaseIntegration is BaseTest {
     function setUp() public virtual override(BaseTest) {
diff --git a/test/foundry/integration/big-bang/NftLicenseRoyalty.t.sol b/test/foundry/integration/big-bang/NftLicenseRoyalty.t.sol
index 55af3bdc2..85b69b866 100644
--- a/test/foundry/integration/big-bang/NftLicenseRoyalty.t.sol
+++ b/test/foundry/integration/big-bang/NftLicenseRoyalty.t.sol
@@ -13,9 +13,9 @@ import { IP } from "contracts/lib/IP.sol";
 import { LSClaimer } from "contracts/modules/royalty-module/policies/LSClaimer.sol";
 
 // test
-import { BaseIntegration } from "test/foundry/integration/BaseIntegration.sol";
+import { BaseIntegration } from "test/foundry/integration/BaseIntegration.t.sol";
 // solhint-disable-next-line max-line-length
-import { UMLPolicyGenericParams, UMLPolicyCommercialParams, UMLPolicyDerivativeParams } from "test/foundry/utils/LicensingHelper.sol";
+import { UMLPolicyGenericParams, UMLPolicyCommercialParams, UMLPolicyDerivativeParams } from "test/foundry/utils/LicensingHelper.t.sol";
 
 contract BigBang_Integration_NftLicenseRoyalty is BaseIntegration {
     using EnumerableSet for EnumerableSet.UintSet;
diff --git a/test/foundry/integration/big-bang/SingleNftCollection.t.sol b/test/foundry/integration/big-bang/SingleNftCollection.t.sol
index 6aff00e8e..52bbb7886 100644
--- a/test/foundry/integration/big-bang/SingleNftCollection.t.sol
+++ b/test/foundry/integration/big-bang/SingleNftCollection.t.sol
@@ -10,10 +10,10 @@ import { IP } from "contracts/lib/IP.sol";
 import { Errors } from "contracts/lib/Errors.sol";
 
 // test
-import { BaseIntegration } from "test/foundry/integration/BaseIntegration.sol";
+import { BaseIntegration } from "test/foundry/integration/BaseIntegration.t.sol";
 import { MintPaymentPolicyFrameworkManager } from "test/foundry/mocks/licensing/MintPaymentPolicyFrameworkManager.sol";
 // solhint-disable-next-line max-line-length
-import { UMLPolicyGenericParams, UMLPolicyCommercialParams, UMLPolicyDerivativeParams } from "test/foundry/utils/LicensingHelper.sol";
+import { UMLPolicyGenericParams, UMLPolicyCommercialParams, UMLPolicyDerivativeParams } from "test/foundry/utils/LicensingHelper.t.sol";
 
 contract BigBang_Integration_SingleNftCollection is BaseIntegration {
     using EnumerableSet for EnumerableSet.UintSet;
diff --git a/test/foundry/integration/flows/emergence-universe/EmergenceUniverse.t.sol b/test/foundry/integration/flows/emergence-universe/EmergenceUniverse.t.sol
index aa2f73c45..8af0059c5 100644
--- a/test/foundry/integration/flows/emergence-universe/EmergenceUniverse.t.sol
+++ b/test/foundry/integration/flows/emergence-universe/EmergenceUniverse.t.sol
@@ -3,7 +3,7 @@ pragma solidity ^0.8.23;
 
 import { Test } from "forge-std/Test.sol";
 
-import { Users, UsersLib } from "test/foundry/utils/Users.sol";
+import { Users, UsersLib } from "test/foundry/utils/Users.t.sol";
 
 contract Integration_Flow_EmergenceUniverse_Test is Test {
     Users internal u;
diff --git a/test/foundry/modules/ModuleBase.t.sol b/test/foundry/modules/ModuleBase.t.sol
index 0b7030264..ec86f9d80 100644
--- a/test/foundry/modules/ModuleBase.t.sol
+++ b/test/foundry/modules/ModuleBase.t.sol
@@ -3,7 +3,7 @@ pragma solidity ^0.8.23;
 
 import { IModule } from "contracts/interfaces/modules/base/IModule.sol";
 
-import { BaseTest } from "test/foundry/utils/BaseTest.sol";
+import { BaseTest } from "test/foundry/utils/BaseTest.t.sol";
 
 /// @title Module Base Test Contract
 /// @notice Base contract for testing standard module functionality.
diff --git a/test/foundry/modules/dispute/ArbitrationPolicySP.t.sol b/test/foundry/modules/dispute/ArbitrationPolicySP.t.sol
index 78aab5ada..5fe1d8ccd 100644
--- a/test/foundry/modules/dispute/ArbitrationPolicySP.t.sol
+++ b/test/foundry/modules/dispute/ArbitrationPolicySP.t.sol
@@ -10,8 +10,8 @@ import { Errors } from "contracts/lib/Errors.sol";
 import { ArbitrationPolicySP } from "contracts/modules/dispute-module/policies/ArbitrationPolicySP.sol";
 // test
 // solhint-disable-next-line max-line-length
-import { UMLPolicyGenericParams, UMLPolicyCommercialParams, UMLPolicyDerivativeParams } from "test/foundry/utils/LicensingHelper.sol";
-import { BaseTest } from "test/foundry/utils/BaseTest.sol";
+import { UMLPolicyGenericParams, UMLPolicyCommercialParams, UMLPolicyDerivativeParams } from "test/foundry/utils/LicensingHelper.t.sol";
+import { BaseTest } from "test/foundry/utils/BaseTest.t.sol";
 
 contract TestArbitrationPolicySP is BaseTest {
     event GovernanceWithdrew(uint256 amount);
diff --git a/test/foundry/modules/dispute/DisputeModule.t.sol b/test/foundry/modules/dispute/DisputeModule.t.sol
index 0061e5f79..b10ab1817 100644
--- a/test/foundry/modules/dispute/DisputeModule.t.sol
+++ b/test/foundry/modules/dispute/DisputeModule.t.sol
@@ -12,8 +12,8 @@ import { ArbitrationPolicySP } from "contracts/modules/dispute-module/policies/A
 import { ShortStringOps } from "contracts/utils/ShortStringOps.sol";
 // test
 // solhint-disable-next-line max-line-length
-import { UMLPolicyGenericParams, UMLPolicyCommercialParams, UMLPolicyDerivativeParams } from "test/foundry/utils/LicensingHelper.sol";
-import { BaseTest } from "test/foundry/utils/BaseTest.sol";
+import { UMLPolicyGenericParams, UMLPolicyCommercialParams, UMLPolicyDerivativeParams } from "test/foundry/utils/LicensingHelper.t.sol";
+import { BaseTest } from "test/foundry/utils/BaseTest.t.sol";
 
 contract DisputeModuleTest is BaseTest {
     event TagWhitelistUpdated(bytes32 tag, bool allowed);
diff --git a/test/foundry/modules/licensing/UMLPolicyFramework.derivation.t.sol b/test/foundry/modules/licensing/UMLPolicyFramework.derivation.t.sol
index 06d4879fa..8b912d424 100644
--- a/test/foundry/modules/licensing/UMLPolicyFramework.derivation.t.sol
+++ b/test/foundry/modules/licensing/UMLPolicyFramework.derivation.t.sol
@@ -7,7 +7,7 @@ import { IRoyaltyModule } from "contracts/interfaces/modules/royalty/IRoyaltyMod
 import { Errors } from "contracts/lib/Errors.sol";
 import { UMLPolicyFrameworkManager } from "contracts/modules/licensing/UMLPolicyFrameworkManager.sol";
 
-import { BaseTest } from "test/foundry/utils/BaseTest.sol";
+import { BaseTest } from "test/foundry/utils/BaseTest.t.sol";
 
 contract UMLPolicyFrameworkCompatibilityTest is BaseTest {
     UMLPolicyFrameworkManager internal umlFramework;
diff --git a/test/foundry/modules/licensing/UMLPolicyFramework.multi-parent.sol b/test/foundry/modules/licensing/UMLPolicyFramework.multi-parent.sol
index ec5e7030d..68c5ff5a9 100644
--- a/test/foundry/modules/licensing/UMLPolicyFramework.multi-parent.sol
+++ b/test/foundry/modules/licensing/UMLPolicyFramework.multi-parent.sol
@@ -11,7 +11,7 @@ import { UMLPolicy } from "contracts/interfaces/modules/licensing/IUMLPolicyFram
 import { UMLPolicyFrameworkManager } from "contracts/modules/licensing/UMLPolicyFrameworkManager.sol";
 import { IPolicyFrameworkManager } from "contracts/interfaces/modules/licensing/IPolicyFrameworkManager.sol";
 
-import { BaseTest } from "test/foundry/utils/BaseTest.sol";
+import { BaseTest } from "test/foundry/utils/BaseTest.t.sol";
 
 contract UMLPolicyFrameworkMultiParentTest is BaseTest {
     UMLPolicyFrameworkManager internal umlFramework;
diff --git a/test/foundry/modules/licensing/UMLPolicyFramework.t.sol b/test/foundry/modules/licensing/UMLPolicyFramework.t.sol
index 3df297aca..03a4519cf 100644
--- a/test/foundry/modules/licensing/UMLPolicyFramework.t.sol
+++ b/test/foundry/modules/licensing/UMLPolicyFramework.t.sol
@@ -10,7 +10,7 @@ import { UMLPolicyFrameworkManager } from "contracts/modules/licensing/UMLPolicy
 
 import { MockERC721 } from "test/foundry/mocks/token/MockERC721.sol";
 import { MockTokenGatedHook } from "test/foundry/mocks/MockTokenGatedHook.sol";
-import { BaseTest } from "test/foundry/utils/BaseTest.sol";
+import { BaseTest } from "test/foundry/utils/BaseTest.t.sol";
 
 contract UMLPolicyFrameworkTest is BaseTest {
     UMLPolicyFrameworkManager internal umlFramework;
diff --git a/test/foundry/modules/royalty/LSClaimer.t.sol b/test/foundry/modules/royalty/LSClaimer.t.sol
index 8ebb7355e..efe810e65 100644
--- a/test/foundry/modules/royalty/LSClaimer.t.sol
+++ b/test/foundry/modules/royalty/LSClaimer.t.sol
@@ -14,8 +14,8 @@ import { LSClaimer } from "contracts/modules/royalty-module/policies/LSClaimer.s
 
 // test
 // solhint-disable-next-line max-line-length
-import { UMLPolicyGenericParams, UMLPolicyCommercialParams, UMLPolicyDerivativeParams } from "test/foundry/utils/LicensingHelper.sol";
-import { BaseTest } from "test/foundry/utils/BaseTest.sol";
+import { UMLPolicyGenericParams, UMLPolicyCommercialParams, UMLPolicyDerivativeParams } from "test/foundry/utils/LicensingHelper.t.sol";
+import { BaseTest } from "test/foundry/utils/BaseTest.t.sol";
 
 contract TestLSClaimer is BaseTest {
     address[] public LONG_CHAIN = new address[](100);
diff --git a/test/foundry/modules/royalty/RoyaltyModule.t.sol b/test/foundry/modules/royalty/RoyaltyModule.t.sol
index 1a34e2408..e22c20735 100644
--- a/test/foundry/modules/royalty/RoyaltyModule.t.sol
+++ b/test/foundry/modules/royalty/RoyaltyModule.t.sol
@@ -6,7 +6,7 @@ import { Errors } from "contracts/lib/Errors.sol";
 import { RoyaltyModule } from "contracts/modules/royalty-module/RoyaltyModule.sol";
 
 // tests
-import { BaseTest } from "../../utils/BaseTest.sol";
+import { BaseTest } from "../../utils/BaseTest.t.sol";
 
 contract TestRoyaltyModule is BaseTest {
     event RoyaltyPolicyWhitelistUpdated(address royaltyPolicy, bool allowed);
diff --git a/test/foundry/modules/royalty/RoyaltyPolicyLS.t.sol b/test/foundry/modules/royalty/RoyaltyPolicyLS.t.sol
index 251ed68c3..ecc6490bb 100644
--- a/test/foundry/modules/royalty/RoyaltyPolicyLS.t.sol
+++ b/test/foundry/modules/royalty/RoyaltyPolicyLS.t.sol
@@ -7,7 +7,7 @@ import { ERC20 } from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
 import { RoyaltyPolicyLS } from "../../../../contracts/modules/royalty-module/policies/RoyaltyPolicyLS.sol";
 import { Errors } from "../../../../contracts/lib/Errors.sol";
 // tests
-import { BaseTest } from "../../utils/BaseTest.sol";
+import { BaseTest } from "../../utils/BaseTest.t.sol";
 
 contract TestLSClaimer is BaseTest {
     RoyaltyPolicyLS internal testRoyaltyPolicyLS;
diff --git a/test/foundry/registries/IPAssetRegistry.t.sol b/test/foundry/registries/IPAssetRegistry.t.sol
index d2cb7209a..2e6bd082e 100644
--- a/test/foundry/registries/IPAssetRegistry.t.sol
+++ b/test/foundry/registries/IPAssetRegistry.t.sol
@@ -7,7 +7,7 @@ import { IP } from "contracts/lib/IP.sol";
 import { IPAssetRegistry } from "contracts/registries/IPAssetRegistry.sol";
 import { Errors } from "contracts/lib/Errors.sol";
 
-import { BaseTest } from "../utils/BaseTest.sol";
+import { BaseTest } from "../utils/BaseTest.t.sol";
 
 /// @title IP Asset Registry Testing Contract
 /// @notice Contract for testing core IP registration.
diff --git a/test/foundry/registries/ModuleRegistry.t.sol b/test/foundry/registries/ModuleRegistry.t.sol
index b1d5dfd7e..bcb9565bb 100644
--- a/test/foundry/registries/ModuleRegistry.t.sol
+++ b/test/foundry/registries/ModuleRegistry.t.sol
@@ -10,7 +10,7 @@ import { IHookModule } from "contracts/interfaces/modules/base/IHookModule.sol";
 import { MockModule } from "../mocks/module/MockModule.sol";
 import { ICustomModule, CustomModule } from "../mocks/CustomModuleType.sol";
 import { MockTokenGatedHook } from "../mocks/MockTokenGatedHook.sol";
-import { BaseTest } from "../utils/BaseTest.sol";
+import { BaseTest } from "../utils/BaseTest.t.sol";
 
 contract ModuleRegistryTest is BaseTest {
     MockModule public module;
diff --git a/test/foundry/registries/metadata/IPAssetRenderer.t.sol b/test/foundry/registries/metadata/IPAssetRenderer.t.sol
index 63005370e..7a9b80756 100644
--- a/test/foundry/registries/metadata/IPAssetRenderer.t.sol
+++ b/test/foundry/registries/metadata/IPAssetRenderer.t.sol
@@ -6,7 +6,7 @@ import { Base64 } from "@openzeppelin/contracts/utils/Base64.sol";
 
 import { IP } from "contracts/lib/IP.sol";
 
-import { BaseTest } from "test/foundry/utils/BaseTest.sol";
+import { BaseTest } from "test/foundry/utils/BaseTest.t.sol";
 
 /// @title IP Asset Renderer Test Contract
 /// @notice Tests IP asset rendering functionality.
diff --git a/test/foundry/registries/metadata/MetadataProvider.t.sol b/test/foundry/registries/metadata/MetadataProvider.t.sol
index 1562575b9..ff6882d61 100644
--- a/test/foundry/registries/metadata/MetadataProvider.t.sol
+++ b/test/foundry/registries/metadata/MetadataProvider.t.sol
@@ -6,7 +6,7 @@ import { MetadataProviderV1 } from "contracts/registries/metadata/MetadataProvid
 import { IMetadataProvider } from "contracts/interfaces/registries/metadata/IMetadataProvider.sol";
 import { Errors } from "contracts/lib/Errors.sol";
 
-import { BaseTest } from "test/foundry/utils/BaseTest.sol";
+import { BaseTest } from "test/foundry/utils/BaseTest.t.sol";
 import { MockMetadataProviderV2 } from "test/foundry/mocks/MockMetadataProviderV2.sol";
 
 /// @title IP Metadata Provider Testing Contract
diff --git a/test/foundry/utils/BaseTest.sol b/test/foundry/utils/BaseTest.t.sol
similarity index 98%
rename from test/foundry/utils/BaseTest.sol
rename to test/foundry/utils/BaseTest.t.sol
index 606207ffc..609fc72d5 100644
--- a/test/foundry/utils/BaseTest.sol
+++ b/test/foundry/utils/BaseTest.t.sol
@@ -13,11 +13,11 @@ import { IP_RESOLVER_MODULE_KEY, REGISTRATION_MODULE_KEY, DISPUTE_MODULE_KEY, TA
 import { AccessPermission } from "../../../contracts/lib/AccessPermission.sol";
 
 // test
-import { DeployHelper } from "./DeployHelper.sol";
-import { LicensingHelper } from "./LicensingHelper.sol";
+import { DeployHelper } from "./DeployHelper.t.sol";
+import { LicensingHelper } from "./LicensingHelper.t.sol";
 import { MockERC20 } from "../mocks/token/MockERC20.sol";
 import { MockERC721 } from "../mocks/token/MockERC721.sol";
-import { Users, UsersLib } from "./Users.sol";
+import { Users, UsersLib } from "./Users.t.sol";
 
 /// @title Base Test Contract
 /// @notice This contract provides a set of protocol-related testing utilities
diff --git a/test/foundry/utils/DeployHelper.sol b/test/foundry/utils/DeployHelper.t.sol
similarity index 100%
rename from test/foundry/utils/DeployHelper.sol
rename to test/foundry/utils/DeployHelper.t.sol
diff --git a/test/foundry/utils/LicensingHelper.sol b/test/foundry/utils/LicensingHelper.t.sol
similarity index 100%
rename from test/foundry/utils/LicensingHelper.sol
rename to test/foundry/utils/LicensingHelper.t.sol
diff --git a/test/foundry/utils/Users.sol b/test/foundry/utils/Users.t.sol
similarity index 100%
rename from test/foundry/utils/Users.sol
rename to test/foundry/utils/Users.t.sol