diff --git a/stateless/test_witness_keys.nim b/stateless/test_witness_keys.nim
index 7783d033b..a15ab53d3 100644
--- a/stateless/test_witness_keys.nim
+++ b/stateless/test_witness_keys.nim
@@ -116,7 +116,7 @@ proc runTest(numPairs: int, testStatusIMPL: var TestStatus, useRogueKeys: static
     for kd in mkeys.keys:
       check kd.visited == true
 
-proc main() =
+proc witnesKeysMain() =
   suite "random keys block witness roundtrip test":
     randomize()
 
@@ -132,4 +132,5 @@ proc main() =
     test "rogue address ignored":
       runTest(rand(1..30), testStatusIMPL, useRogueKeys = true)
 
-main()
+when isMainModule:
+  witnessKeysMain()
diff --git a/tests/all_tests.nim b/tests/all_tests.nim
index d08589502..d616a669c 100644
--- a/tests/all_tests.nim
+++ b/tests/all_tests.nim
@@ -99,5 +99,6 @@ cliBuilder:
           ./test_state_db,
           ./test_difficulty,
           ./test_transaction_json,
-          ./test_blockchain_json
-
+          ./test_blockchain_json,
+          ../stateless/test_witness_keys,
+          ../stateless/test_block_witness