diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ba6c7a175..a6bd8140c 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -184,6 +184,19 @@ jobs:
           cp .env.example .env
           make run-nodes & make test-end-to-end
 
+  forge-test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - name: Install Foundry
+        uses: foundry-rs/foundry-toolchain@v1
+        with:
+          version: nightly
+      - name: Install deps
+        run: forge install
+      - name: Run tests
+        run: forge test -vvv
+
   ef-tests:
     runs-on: ubuntu-latest-32-cores
     needs: build
diff --git a/solidity_contracts/tests/L1KakarotMessage.t.sol b/solidity_contracts/tests/L1KakarotMessage.t.sol
index a576b0734..f9973104b 100644
--- a/solidity_contracts/tests/L1KakarotMessage.t.sol
+++ b/solidity_contracts/tests/L1KakarotMessage.t.sol
@@ -4,6 +4,7 @@ import "forge-std/Test.sol";
 
 import {L1KakarotMessaging} from "../src/L1L2Messaging/L1KakarotMessaging.sol";
 import {StarknetMessagingLocal} from "../src/starknet/StarknetMessagingLocal.sol";
+import {AddressAliasHelper} from "../src/L1L2Messaging/AddressAliasHelper.sol";
 
 contract L1KakarotMessagingTest is Test {
     L1KakarotMessaging l1KakarotMessaging;
@@ -34,7 +35,7 @@ contract L1KakarotMessagingTest is Test {
 
         uint256 totalLength = data.length + 4;
         uint256[] memory convertedData = new uint256[](totalLength);
-        convertedData[0] = uint256(uint160(address(this)));
+        convertedData[0] = uint256(uint160(AddressAliasHelper.applyL1ToL2Alias(address(this))));
         convertedData[1] = uint256(uint160(to));
         convertedData[2] = value;
         convertedData[3] = data.length;