diff --git a/Cargo.lock b/Cargo.lock
index 9df04cbf..5247b7a5 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -214,7 +214,6 @@ name = "anchor-spl"
 version = "0.18.0"
 dependencies = [
  "anchor-lang",
- "lazy_static",
  "serum_dex",
  "solana-program",
  "spl-associated-token-account",
diff --git a/spl/Cargo.toml b/spl/Cargo.toml
index 7f8aa3d0..7d637e56 100644
--- a/spl/Cargo.toml
+++ b/spl/Cargo.toml
@@ -14,10 +14,11 @@ associated_token = []
 governance = []
 shmem = []
 devnet = []
+dex = ["serum_dex"]
 
 [dependencies]
 anchor-lang = { path = "../lang", version = "0.18.0", features = ["derive"] }
-serum_dex = { git = "https://github.com/project-serum/serum-dex", rev = "1be91f2", version = "0.4.0", features = ["no-entrypoint"], optional = true}
+serum_dex = { git = "https://github.com/project-serum/serum-dex", rev = "1be91f2", version = "0.4.0", features = ["no-entrypoint"], optional = true }
 solana-program = "1.8.0"
 spl-token = { version = "3.1.1", features = ["no-entrypoint"] }
 spl-associated-token-account = { version = "1.0.3", features = ["no-entrypoint"] }
diff --git a/spl/src/lib.rs b/spl/src/lib.rs
index 526ee2eb..62d09628 100644
--- a/spl/src/lib.rs
+++ b/spl/src/lib.rs
@@ -7,7 +7,7 @@ pub mod mint;
 #[cfg(feature = "token")]
 pub mod token;
 
-#[cfg(feature = "serum_dex")]
+#[cfg(feature = "dex")]
 pub mod dex;
 
 #[cfg(feature = "governance")]
diff --git a/tests/cfo/deps/swap b/tests/cfo/deps/swap
index 0382f2e2..8628dc7e 160000
--- a/tests/cfo/deps/swap
+++ b/tests/cfo/deps/swap
@@ -1 +1 @@
-Subproject commit 0382f2e27db5f95d09aec5e6df7bb01bfc8f0e7f
+Subproject commit 8628dc7edbccafc49e75c21977a2abdde10b0898
diff --git a/tests/permissioned-markets/programs/permissioned-markets-middleware/Cargo.toml b/tests/permissioned-markets/programs/permissioned-markets-middleware/Cargo.toml
index b01fbc97..7724bd60 100644
--- a/tests/permissioned-markets/programs/permissioned-markets-middleware/Cargo.toml
+++ b/tests/permissioned-markets/programs/permissioned-markets-middleware/Cargo.toml
@@ -16,5 +16,5 @@ default = []
 
 [dependencies]
 anchor-lang = { path = "../../../../lang" }
-anchor-spl = { path = "../../../../spl" }
+anchor-spl = { path = "../../../../spl", features = ["dex"] }
 solana-program = "1.8.0"
diff --git a/tests/permissioned-markets/programs/permissioned-markets/Cargo.toml b/tests/permissioned-markets/programs/permissioned-markets/Cargo.toml
index 5e099c14..de5ea5bc 100644
--- a/tests/permissioned-markets/programs/permissioned-markets/Cargo.toml
+++ b/tests/permissioned-markets/programs/permissioned-markets/Cargo.toml
@@ -16,7 +16,6 @@ default = []
 
 [dependencies]
 anchor-lang = { path = "../../../../lang" }
-anchor-spl = { path = "../../../../spl" }
-serum_dex = { path = "../../deps/serum-dex/dex", features = ["no-entrypoint"] }
+anchor-spl = { path = "../../../../spl", features = ["dex"] }
 solana-program = "1.8.0"
 spl-token = { version = "3.1.1", features = ["no-entrypoint"] }
diff --git a/tests/permissioned-markets/programs/permissioned-markets/src/lib.rs b/tests/permissioned-markets/programs/permissioned-markets/src/lib.rs
index 6d7cf07a..faa5f16b 100644
--- a/tests/permissioned-markets/programs/permissioned-markets/src/lib.rs
+++ b/tests/permissioned-markets/programs/permissioned-markets/src/lib.rs
@@ -2,9 +2,9 @@
 
 use anchor_lang::prelude::*;
 use anchor_spl::dex;
-use serum_dex::instruction::MarketInstruction;
-use serum_dex::matching::Side;
-use serum_dex::state::OpenOrders;
+use anchor_spl::dex::serum_dex::instruction::MarketInstruction;
+use anchor_spl::dex::serum_dex::matching::Side;
+use anchor_spl::dex::serum_dex::state::OpenOrders;
 use solana_program::instruction::Instruction;
 use solana_program::system_program;
 use solana_program::sysvar::rent;
diff --git a/tests/swap/programs/swap/Cargo.toml b/tests/swap/programs/swap/Cargo.toml
index 9f8b5cce..ee86bd42 100644
--- a/tests/swap/programs/swap/Cargo.toml
+++ b/tests/swap/programs/swap/Cargo.toml
@@ -16,4 +16,4 @@ default = []
 
 [dependencies]
 anchor-lang = { path = "../../../../lang" }
-anchor-spl = { path = "../../../../spl" }
+anchor-spl = { path = "../../../../spl", features = ["dex"] }