diff --git a/test/ERC20/ERC20Facet.t.sol b/test/token/ERC20/ERC20/ERC20Facet.t.sol
similarity index 99%
rename from test/ERC20/ERC20Facet.t.sol
rename to test/token/ERC20/ERC20/ERC20Facet.t.sol
index 2ecc159c..38bcf41b 100644
--- a/test/ERC20/ERC20Facet.t.sol
+++ b/test/token/ERC20/ERC20/ERC20Facet.t.sol
@@ -2,7 +2,7 @@
 pragma solidity >=0.8.30;
 
 import {Test} from "forge-std/Test.sol";
-import {ERC20Facet} from "../../src/token/ERC20/ERC20/ERC20Facet.sol";
+import {ERC20Facet} from "../../../../src/token/ERC20/ERC20/ERC20Facet.sol";
 import {ERC20FacetHarness} from "./harnesses/ERC20FacetHarness.sol";
 
 contract ERC20FacetTest is Test {
diff --git a/test/ERC20/LibERC20.t.sol b/test/token/ERC20/ERC20/LibERC20.t.sol
similarity index 99%
rename from test/ERC20/LibERC20.t.sol
rename to test/token/ERC20/ERC20/LibERC20.t.sol
index 6cb2b00a..9bc8840e 100644
--- a/test/ERC20/LibERC20.t.sol
+++ b/test/token/ERC20/ERC20/LibERC20.t.sol
@@ -3,7 +3,7 @@ pragma solidity >=0.8.30;
 
 import {Test} from "forge-std/Test.sol";
 import {LibERC20Harness} from "./harnesses/LibERC20Harness.sol";
-import {LibERC20} from "../../src/token/ERC20/ERC20/LibERC20.sol";
+import {LibERC20} from "../../../../src/token/ERC20/ERC20/LibERC20.sol";
 
 contract LibERC20Test is Test {
     LibERC20Harness public harness;
diff --git a/test/ERC20/harnesses/ERC20FacetHarness.sol b/test/token/ERC20/ERC20/harnesses/ERC20FacetHarness.sol
similarity index 93%
rename from test/ERC20/harnesses/ERC20FacetHarness.sol
rename to test/token/ERC20/ERC20/harnesses/ERC20FacetHarness.sol
index 623b434e..d4dd0952 100644
--- a/test/ERC20/harnesses/ERC20FacetHarness.sol
+++ b/test/token/ERC20/ERC20/harnesses/ERC20FacetHarness.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity >=0.8.30;
 
-import {ERC20Facet} from "../../../src/token/ERC20/ERC20/ERC20Facet.sol";
+import {ERC20Facet} from "../../../../../src/token/ERC20/ERC20/ERC20Facet.sol";
 
 /// @title ERC20FacetHarness
 /// @notice Test harness for ERC20Facet that adds initialization and minting for testing
diff --git a/test/ERC20/harnesses/LibERC20Harness.sol b/test/token/ERC20/ERC20/harnesses/LibERC20Harness.sol
similarity index 96%
rename from test/ERC20/harnesses/LibERC20Harness.sol
rename to test/token/ERC20/ERC20/harnesses/LibERC20Harness.sol
index 514ad0a2..1ad0595a 100644
--- a/test/ERC20/harnesses/LibERC20Harness.sol
+++ b/test/token/ERC20/ERC20/harnesses/LibERC20Harness.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: MIT
 pragma solidity >=0.8.30;
 
-import {LibERC20} from "../../../src/token/ERC20/ERC20/LibERC20.sol";
+import {LibERC20} from "../../../../../src/token/ERC20/ERC20/LibERC20.sol";
 
 /// @title LibERC20Harness
 /// @notice Test harness that exposes LibERC20's internal functions as external