diff --git a/contracts/mocks/BlockhashMock.sol b/contracts/mocks/BlockhashMock.sol
deleted file mode 100644
index 496869e59..000000000
--- a/contracts/mocks/BlockhashMock.sol
+++ /dev/null
@@ -1,7 +0,0 @@
-// SPDX-License-Identifier: MIT
-pragma solidity ^0.8.20;
-
-import {Blockhash} from "../utils/Blockhash.sol";
-
-/// @dev This mock is required for upgradeable tests to pass
-contract BlockhashMock {}
diff --git a/contracts/mocks/Stateless.sol b/contracts/mocks/Stateless.sol
index 0bc89e4ce..5c323299c 100644
--- a/contracts/mocks/Stateless.sol
+++ b/contracts/mocks/Stateless.sol
@@ -9,6 +9,7 @@ import {Arrays} from "../utils/Arrays.sol";
 import {AuthorityUtils} from "../access/manager/AuthorityUtils.sol";
 import {Base64} from "../utils/Base64.sol";
 import {BitMaps} from "../utils/structs/BitMaps.sol";
+import {Blockhash} from "../utils/Blockhash.sol";
 import {Bytes} from "../utils/Bytes.sol";
 import {CAIP2} from "../utils/CAIP2.sol";
 import {CAIP10} from "../utils/CAIP10.sol";