diff --git a/remappings.txt b/remappings.txt
index feaba2dd1..9da1c6722 100644
--- a/remappings.txt
+++ b/remappings.txt
@@ -1 +1 @@
-forge-std/=lib/forge-std/src/
+@morpho-blue/=./
diff --git a/test/forge/BaseTest.sol b/test/forge/BaseTest.sol
index 7c2f52daf..3a59787a0 100644
--- a/test/forge/BaseTest.sol
+++ b/test/forge/BaseTest.sol
@@ -1,20 +1,20 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 pragma solidity ^0.8.0;
 
-import "forge-std/Test.sol";
-import "forge-std/console.sol";
+import "../../lib/forge-std/src/Test.sol";
+import "../../lib/forge-std/src/console.sol";
 
-import "src/interfaces/IMorphoCallbacks.sol";
-import {IrmMock} from "src/mocks/IrmMock.sol";
-import {ERC20Mock} from "src/mocks/ERC20Mock.sol";
-import {OracleMock} from "src/mocks/OracleMock.sol";
+import "../../src/interfaces/IMorphoCallbacks.sol";
+import {IrmMock} from "../../src/mocks/IrmMock.sol";
+import {ERC20Mock} from "../../src/mocks/ERC20Mock.sol";
+import {OracleMock} from "../../src/mocks/OracleMock.sol";
 
-import "src/Morpho.sol";
+import "../../src/Morpho.sol";
 import {Math} from "./helpers/Math.sol";
 import {SigUtils} from "./helpers/SigUtils.sol";
 import {ArrayLib} from "./helpers/ArrayLib.sol";
-import {MorphoLib} from "src/libraries/periphery/MorphoLib.sol";
-import {MorphoBalancesLib} from "src/libraries/periphery/MorphoBalancesLib.sol";
+import {MorphoLib} from "../../src/libraries/periphery/MorphoLib.sol";
+import {MorphoBalancesLib} from "../../src/libraries/periphery/MorphoBalancesLib.sol";
 
 contract BaseTest is Test {
     using Math for uint256;
diff --git a/test/forge/MarketParamsLibTest.sol b/test/forge/MarketParamsLibTest.sol
index 16fa65126..9ce372840 100644
--- a/test/forge/MarketParamsLibTest.sol
+++ b/test/forge/MarketParamsLibTest.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 pragma solidity ^0.8.0;
 
-import "forge-std/Test.sol";
+import "../../lib/forge-std/src/Test.sol";
 
 import {MarketParamsLib, MarketParams, Id} from "src/libraries/MarketParamsLib.sol";
 
diff --git a/test/forge/helpers/SigUtils.sol b/test/forge/helpers/SigUtils.sol
index b4ae5b3da..9a60b52f0 100644
--- a/test/forge/helpers/SigUtils.sol
+++ b/test/forge/helpers/SigUtils.sol
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 pragma solidity ^0.8.0;
 
-import {AUTHORIZATION_TYPEHASH} from "src/libraries/ConstantsLib.sol";
+import {AUTHORIZATION_TYPEHASH} from "../../../src/libraries/ConstantsLib.sol";
 
-import {Authorization} from "src/interfaces/IMorpho.sol";
+import {Authorization} from "../../../src/interfaces/IMorpho.sol";
 
 library SigUtils {
     /// @dev Computes the hash of the EIP-712 encoded data.
diff --git a/test/forge/libraries/MathLibTest.sol b/test/forge/libraries/MathLibTest.sol
index b431aab1f..b6f38471e 100644
--- a/test/forge/libraries/MathLibTest.sol
+++ b/test/forge/libraries/MathLibTest.sol
@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 pragma solidity ^0.8.0;
 
-import "forge-std/Test.sol";
+import "../../../lib/forge-std/src/Test.sol";
 
-import "src/libraries/MathLib.sol";
-import "test/forge/helpers/WadMath.sol";
+import "../../../src/libraries/MathLib.sol";
+import "../helpers/WadMath.sol";
 
 contract MathLibTest is Test {
     using MathLib for uint256;
diff --git a/test/forge/libraries/SafeTransferLibTest.sol b/test/forge/libraries/SafeTransferLibTest.sol
index a049d8283..de019de1b 100644
--- a/test/forge/libraries/SafeTransferLibTest.sol
+++ b/test/forge/libraries/SafeTransferLibTest.sol
@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 pragma solidity ^0.8.0;
 
-import "forge-std/Test.sol";
+import "../../../lib/forge-std/src/Test.sol";
 
-import "src/libraries/ErrorsLib.sol";
-import {IERC20, SafeTransferLib} from "src/libraries/SafeTransferLib.sol";
+import "../../../src/libraries/ErrorsLib.sol";
+import {IERC20, SafeTransferLib} from "../../../src/libraries/SafeTransferLib.sol";
 
 /// @dev Token not returning any boolean on transfer and transferFrom.
 contract ERC20WithoutBoolean {
diff --git a/test/forge/libraries/UtilsLibTest.sol b/test/forge/libraries/UtilsLibTest.sol
index b68184007..5d3441bf4 100644
--- a/test/forge/libraries/UtilsLibTest.sol
+++ b/test/forge/libraries/UtilsLibTest.sol
@@ -1,10 +1,10 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 pragma solidity ^0.8.0;
 
-import "forge-std/Test.sol";
+import "../../../lib/forge-std/src/Test.sol";
 
-import "src/libraries/ErrorsLib.sol";
-import "src/libraries/UtilsLib.sol";
+import "../../../src/libraries/ErrorsLib.sol";
+import "../../../src/libraries/UtilsLib.sol";
 
 contract UtilsLibTest is Test {
     using UtilsLib for uint256;
diff --git a/test/forge/libraries/periphery/MorphoLibTest.sol b/test/forge/libraries/periphery/MorphoLibTest.sol
index b7ad0f3bb..864bee16b 100644
--- a/test/forge/libraries/periphery/MorphoLibTest.sol
+++ b/test/forge/libraries/periphery/MorphoLibTest.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 pragma solidity ^0.8.0;
 
-import {MorphoBalancesLib} from "src/libraries/periphery/MorphoBalancesLib.sol";
+import {MorphoBalancesLib} from "../../../../src/libraries/periphery/MorphoBalancesLib.sol";
 
 import "../../BaseTest.sol";
 
diff --git a/test/forge/libraries/periphery/MorphoStorageLibTest.sol b/test/forge/libraries/periphery/MorphoStorageLibTest.sol
index fb6b58097..8f88f4de0 100644
--- a/test/forge/libraries/periphery/MorphoStorageLibTest.sol
+++ b/test/forge/libraries/periphery/MorphoStorageLibTest.sol
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0-or-later
 pragma solidity ^0.8.0;
 
-import {MorphoStorageLib} from "src/libraries/periphery/MorphoStorageLib.sol";
+import {MorphoStorageLib} from "../../../../src/libraries/periphery/MorphoStorageLib.sol";
 import {SigUtils} from "../../helpers/SigUtils.sol";
 
 import "../../BaseTest.sol";