diff --git a/fuzzers/keystore/corpus/0176eaf52ed014ec5c91cf4afa070dd3fd469077-1 b/tests/fuzzers/keystore/corpus/0176eaf52ed014ec5c91cf4afa070dd3fd469077-1
similarity index 100%
rename from fuzzers/keystore/corpus/0176eaf52ed014ec5c91cf4afa070dd3fd469077-1
rename to tests/fuzzers/keystore/corpus/0176eaf52ed014ec5c91cf4afa070dd3fd469077-1
diff --git a/fuzzers/keystore/keystore-fuzz.go b/tests/fuzzers/keystore/keystore-fuzz.go
similarity index 100%
rename from fuzzers/keystore/keystore-fuzz.go
rename to tests/fuzzers/keystore/keystore-fuzz.go
diff --git a/tests/fuzzers/rlp/README.txt b/tests/fuzzers/rlp/README.txt
new file mode 100644
index 0000000000..3497d8703f
--- /dev/null
+++ b/tests/fuzzers/rlp/README.txt
@@ -0,0 +1,9 @@
+To run this locally
+
+```
+CGO_ENABLED=0 go-fuzz-build .
+```
+Then
+```
+go-fuzz
+```
diff --git a/fuzzers/rlp/corpus/r.bin b/tests/fuzzers/rlp/corpus/r.bin
similarity index 100%
rename from fuzzers/rlp/corpus/r.bin
rename to tests/fuzzers/rlp/corpus/r.bin
diff --git a/fuzzers/rlp/rlp_fuzzer.go b/tests/fuzzers/rlp/rlp_fuzzer.go
similarity index 100%
rename from fuzzers/rlp/rlp_fuzzer.go
rename to tests/fuzzers/rlp/rlp_fuzzer.go
diff --git a/fuzzers/trie/corpus/data b/tests/fuzzers/trie/corpus/data
similarity index 100%
rename from fuzzers/trie/corpus/data
rename to tests/fuzzers/trie/corpus/data
diff --git a/fuzzers/trie/trie-fuzzer.go b/tests/fuzzers/trie/trie-fuzzer.go
similarity index 100%
rename from fuzzers/trie/trie-fuzzer.go
rename to tests/fuzzers/trie/trie-fuzzer.go
diff --git a/fuzzers/whisperv6/corpus/009c5adfa4fd685caef58e1ce932fa7fb209730a b/tests/fuzzers/whisperv6/corpus/009c5adfa4fd685caef58e1ce932fa7fb209730a
similarity index 100%
rename from fuzzers/whisperv6/corpus/009c5adfa4fd685caef58e1ce932fa7fb209730a
rename to tests/fuzzers/whisperv6/corpus/009c5adfa4fd685caef58e1ce932fa7fb209730a
diff --git a/fuzzers/whisperv6/whisper-fuzzer.go b/tests/fuzzers/whisperv6/whisper-fuzzer.go
similarity index 100%
rename from fuzzers/whisperv6/whisper-fuzzer.go
rename to tests/fuzzers/whisperv6/whisper-fuzzer.go