diff --git a/tests/dv5/single_node.py b/old_tests/dv5/single_node.py
similarity index 100%
rename from tests/dv5/single_node.py
rename to old_tests/dv5/single_node.py
diff --git a/tests/gossip/topic_membership.py b/old_tests/gossip/topic_membership.py
similarity index 97%
rename from tests/gossip/topic_membership.py
rename to old_tests/gossip/topic_membership.py
index f1a33f4..d14cdfe 100644
--- a/tests/gossip/topic_membership.py
+++ b/old_tests/gossip/topic_membership.py
@@ -6,6 +6,7 @@
 
 import trio
 
+# TODO: add ForkDigestValue
 EXPECTED_TOPICS = ["/eth2/beacon_block/ssz", "/eth2/beacon_attestation/ssz", "/eth2/voluntary_exit/ssz",
                    "/eth2/proposer_slashing/ssz", "/eth2/attester_slashing/ssz"]
 
diff --git a/tests/reqresp/blocks_by_range.py b/old_tests/reqresp/blocks_by_range.py
similarity index 100%
rename from tests/reqresp/blocks_by_range.py
rename to old_tests/reqresp/blocks_by_range.py
diff --git a/tests/reqresp/blocks_by_root.py b/old_tests/reqresp/blocks_by_root.py
similarity index 100%
rename from tests/reqresp/blocks_by_root.py
rename to old_tests/reqresp/blocks_by_root.py
diff --git a/tests/reqresp/metadata.py b/old_tests/reqresp/metadata.py
similarity index 100%
rename from tests/reqresp/metadata.py
rename to old_tests/reqresp/metadata.py