diff --git a/test/Base.t.sol b/test/Base.t.sol
index 76642099..7c6ce798 100644
--- a/test/Base.t.sol
+++ b/test/Base.t.sol
@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity >=0.8.19 <0.9.0;
 
-import { ERC20 } from "@openzeppelin/contracts/token/ERC20/ERC20.sol";
 import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import { IERC20Metadata } from "@openzeppelin/contracts/token/ERC20/extensions/IERC20Metadata.sol";
 import { IPRBProxy } from "@prb/proxy/interfaces/IPRBProxy.sol";
@@ -13,7 +12,6 @@ import { ISablierV2LockupLinear } from "@sablier/v2-core/interfaces/ISablierV2Lo
 import { IAllowanceTransfer } from "permit2/interfaces/IAllowanceTransfer.sol";
 import { LockupDynamic, LockupLinear } from "@sablier/v2-core/types/DataTypes.sol";
 
-import { Strings } from "@openzeppelin/contracts/utils/Strings.sol";
 import { Utils as V2CoreUtils } from "@sablier/v2-core-test/utils/Utils.sol";
 import { StdCheats } from "forge-std/StdCheats.sol";
 
diff --git a/test/fork/target/batchCreate.t.sol b/test/fork/target/batchCreate.t.sol
index d9e3f929..f6221a1a 100644
--- a/test/fork/target/batchCreate.t.sol
+++ b/test/fork/target/batchCreate.t.sol
@@ -4,7 +4,6 @@ pragma solidity >=0.8.19 <0.9.0;
 import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import { IPRBProxy } from "@prb/proxy/interfaces/IPRBProxy.sol";
 import { LockupDynamic, LockupLinear } from "@sablier/v2-core/types/DataTypes.sol";
-import { IAllowanceTransfer } from "permit2/interfaces/IAllowanceTransfer.sol";
 
 import { PermitSignature } from "permit2-test/utils/PermitSignature.sol";
 
diff --git a/test/integration/plugin/on-stream-canceled/onStreamCanceled.t.sol b/test/integration/plugin/on-stream-canceled/onStreamCanceled.t.sol
index 7bbab355..091c7dce 100644
--- a/test/integration/plugin/on-stream-canceled/onStreamCanceled.t.sol
+++ b/test/integration/plugin/on-stream-canceled/onStreamCanceled.t.sol
@@ -1,8 +1,6 @@
 // SPDX-License-Identifier: UNLICENSED
 pragma solidity >=0.8.19 <0.9.0;
 
-import { LockupLinear } from "@sablier/v2-core/types/DataTypes.sol";
-
 import { ISablierV2ProxyPlugin } from "src/interfaces/ISablierV2ProxyPlugin.sol";
 import { Errors } from "src/libraries/Errors.sol";
 
diff --git a/test/integration/target/burn/burn.t.sol b/test/integration/target/burn/burn.t.sol
index 77e8ba3a..8766ce4d 100644
--- a/test/integration/target/burn/burn.t.sol
+++ b/test/integration/target/burn/burn.t.sol
@@ -2,7 +2,7 @@
 pragma solidity >=0.8.19 <0.9.0;
 
 import { ISablierV2Lockup } from "@sablier/v2-core/interfaces/ISablierV2Lockup.sol";
-import { Lockup, LockupDynamic, LockupLinear } from "@sablier/v2-core/types/DataTypes.sol";
+import { LockupDynamic, LockupLinear } from "@sablier/v2-core/types/DataTypes.sol";
 
 import { Errors } from "src/libraries/Errors.sol";
 
diff --git a/test/integration/target/cancel-multiple/cancelMultiple.t.sol b/test/integration/target/cancel-multiple/cancelMultiple.t.sol
index df9c00cc..addf1d0c 100644
--- a/test/integration/target/cancel-multiple/cancelMultiple.t.sol
+++ b/test/integration/target/cancel-multiple/cancelMultiple.t.sol
@@ -6,7 +6,6 @@ import { ISablierV2Lockup } from "@sablier/v2-core/interfaces/ISablierV2Lockup.s
 import { Lockup } from "@sablier/v2-core/types/DataTypes.sol";
 
 import { Errors } from "src/libraries/Errors.sol";
-import { Batch } from "src/types/DataTypes.sol";
 
 import { Integration_Test } from "../../Integration.t.sol";
 
diff --git a/test/utils/ArrayBuilder.sol b/test/utils/ArrayBuilder.sol
index a18fd0ef..4ca431a7 100644
--- a/test/utils/ArrayBuilder.sol
+++ b/test/utils/ArrayBuilder.sol
@@ -1,8 +1,6 @@
 // SPDX-License-Identifier: GPL-3.0-or-later
 pragma solidity >=0.8.19;
 
-import { Batch } from "../../src/types/DataTypes.sol";
-
 library ArrayBuilder {
     /// @notice Generates an ordered array of integers which starts at `firstStreamId` and ends at `firstStreamId +
     /// batchSize - 1`.
diff --git a/test/utils/Defaults.sol b/test/utils/Defaults.sol
index d16ba50a..809bc0f6 100644
--- a/test/utils/Defaults.sol
+++ b/test/utils/Defaults.sol
@@ -4,7 +4,7 @@ pragma solidity >=0.8.19 <0.9.0;
 import { IERC20 } from "@openzeppelin/contracts/token/ERC20/IERC20.sol";
 import { IPRBProxy } from "@prb/proxy/interfaces/IPRBProxy.sol";
 import { ud2x18, UD60x18 } from "@sablier/v2-core/types/Math.sol";
-import { Broker, Lockup, LockupDynamic, LockupLinear } from "@sablier/v2-core/types/DataTypes.sol";
+import { Broker, LockupDynamic, LockupLinear } from "@sablier/v2-core/types/DataTypes.sol";
 import { IAllowanceTransfer } from "permit2/interfaces/IAllowanceTransfer.sol";
 import { PermitSignature } from "permit2-test/utils/PermitSignature.sol";