diff --git a/test/reader/StorageAccessible.t.sol b/test/reader/StorageAccessible.t.sol
index 2af27890..942183b7 100644
--- a/test/reader/StorageAccessible.t.sol
+++ b/test/reader/StorageAccessible.t.sol
@@ -1,10 +1,8 @@
 // SPDX-License-Identifier: LGPL-3.0-or-later
-
-pragma solidity >=0.7.6 <0.9.0;
-pragma abicoder v2;
+pragma solidity ^0.8.0;
 
 import {Test, Vm} from "forge-std/Test.sol";
-import {StorageAccessibleWrapper, ExternalStorageReader} from "test/src/vendor/StorageAccessibleWrapper.sol";
+import {StorageAccessibleWrapper, ExternalStorageReader} from "./StorageAccessibleWrapper.sol";
 import {ViewStorageAccessible} from "src/contracts/mixins/StorageAccessible.sol";
 
 contract StorageAccessibleTest is Test {
diff --git a/test/src/vendor/StorageAccessibleWrapper.sol b/test/reader/StorageAccessibleWrapper.sol
similarity index 98%
rename from test/src/vendor/StorageAccessibleWrapper.sol
rename to test/reader/StorageAccessibleWrapper.sol
index 3c53e679..6475f425 100644
--- a/test/src/vendor/StorageAccessibleWrapper.sol
+++ b/test/reader/StorageAccessibleWrapper.sol
@@ -1,5 +1,5 @@
 // SPDX-License-Identifier: LGPL-3.0-only
-pragma solidity >=0.7.6 <0.9.0;
+pragma solidity ^0.8.0;
 
 import "src/contracts/mixins/StorageAccessible.sol";
 
diff --git a/test/reader/StorageReadable.t.sol b/test/reader/StorageReadable.t.sol
index 8ee1da68..28fb955f 100644
--- a/test/reader/StorageReadable.t.sol
+++ b/test/reader/StorageReadable.t.sol
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: LGPL-3.0-or-later
-pragma solidity >=0.7.6 <0.9.0;
-pragma abicoder v2;
+pragma solidity ^0.8.0;
 
 import {Test} from "forge-std/Test.sol";
-import {StorageAccessibleWrapper} from "test/src/vendor/StorageAccessibleWrapper.sol";
+
+import {StorageAccessibleWrapper} from "./StorageAccessibleWrapper.sol";
 
 contract StorageReadableTest is Test {
     StorageAccessibleWrapper instance;
diff --git a/test/reader/ViewStorageAccessible.t.sol b/test/reader/ViewStorageAccessible.t.sol
index d22caeeb..1e3e60d6 100644
--- a/test/reader/ViewStorageAccessible.t.sol
+++ b/test/reader/ViewStorageAccessible.t.sol
@@ -1,12 +1,12 @@
 // SPDX-License-Identifier: LGPL-3.0-or-later
-
-pragma solidity >=0.7.6 <0.9.0;
-pragma abicoder v2;
+pragma solidity ^0.8.0;
 
 import {Test} from "forge-std/Test.sol";
-import {StorageAccessibleWrapper, ExternalStorageReader} from "test/src/vendor/StorageAccessibleWrapper.sol";
+
 import {ViewStorageAccessible} from "src/contracts/mixins/StorageAccessible.sol";
 
+import {StorageAccessibleWrapper, ExternalStorageReader} from "./StorageAccessibleWrapper.sol";
+
 contract StorageAccessibleTest is Test {
     StorageAccessibleWrapper instance;
     ExternalStorageReader reader;