diff --git a/Cargo.lock b/Cargo.lock
index 397d0c7fe823af0f01e541dc8f2bde49ec43fd74..55cc1721bddeb3ec5209a4db3732d8042393e55b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -14608,10 +14608,9 @@ name = "pallet-paged-list-fuzzer"
 version = "0.1.0"
 dependencies = [
  "arbitrary",
- "frame-support 28.0.0",
  "honggfuzz",
  "pallet-paged-list 0.6.0",
- "sp-io 30.0.0",
+ "polkadot-sdk-frame 0.1.0",
 ]
 
 [[package]]
diff --git a/substrate/frame/paged-list/fuzzer/Cargo.toml b/substrate/frame/paged-list/fuzzer/Cargo.toml
index 7e6162df09ba6bbfbc3a91ccfcc5649446fa0041..32535093b59805859a2b8d49f18412e4216f0d89 100644
--- a/substrate/frame/paged-list/fuzzer/Cargo.toml
+++ b/substrate/frame/paged-list/fuzzer/Cargo.toml
@@ -18,8 +18,13 @@ path = "src/paged_list.rs"
 
 [dependencies]
 arbitrary = { workspace = true }
+frame = { workspace = true, features = ["runtime"] }
 honggfuzz = { workspace = true }
-
-frame-support = { features = ["std"], workspace = true }
 pallet-paged-list = { features = ["std"], workspace = true }
-sp-io = { features = ["std"], workspace = true }
+
+[features]
+default = ["std"]
+std = [
+	"frame/std",
+	"pallet-paged-list/std",
+]
diff --git a/substrate/frame/paged-list/fuzzer/src/paged_list.rs b/substrate/frame/paged-list/fuzzer/src/paged_list.rs
index 43b797eee6bfb088412c90964d8f3332b0c039a7..f0f914de14229cf721cb8abaedebdf99a4578449 100644
--- a/substrate/frame/paged-list/fuzzer/src/paged_list.rs
+++ b/substrate/frame/paged-list/fuzzer/src/paged_list.rs
@@ -30,9 +30,12 @@
 use arbitrary::Arbitrary;
 use honggfuzz::fuzz;
 
-use frame_support::{storage::StorageList, StorageNoopGuard};
+use frame::{
+	prelude::*, runtime::prelude::storage::storage_noop_guard::StorageNoopGuard,
+	testing_prelude::TestExternalities,
+};
+
 use pallet_paged_list::mock::{PagedList as List, *};
-use sp_io::TestExternalities;
 type Meta = MetaOf<Test, ()>;
 
 fn main() {