diff --git a/.gitmodules b/.gitmodules
index a06b89c8..9d6618d5 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,6 +4,3 @@
 [submodule "lib/permit2"]
 	path = lib/permit2
 	url = https://github.com/Uniswap/permit2
-[submodule "lib/forge-std"]
-	path = lib/forge-std
-	url = https://github.com/foundry-rs/forge-std
diff --git a/lib/forge-std b/lib/forge-std
deleted file mode 160000
index 1de6eecf..00000000
--- a/lib/forge-std
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 1de6eecf821de7fe2c908cc48d3ab3dced20717f
diff --git a/remappings.txt b/remappings.txt
index a78d8c9d..822fdd15 100644
--- a/remappings.txt
+++ b/remappings.txt
@@ -1,4 +1,5 @@
 @uniswap/v4-core/=lib/v4-core/
 ds-test/=lib/v4-core/lib/forge-std/lib/ds-test/src/
+forge-std/=lib/v4-core/lib/forge-std/src/
 openzeppelin-contracts/=lib/v4-core/lib/openzeppelin-contracts/
 solmate/=lib/v4-core/lib/solmate/