diff --git a/calyx-py/test/correctness/queues/binheap.data b/calyx-py/test/correctness/queues/binheap/binheap.data
similarity index 100%
rename from calyx-py/test/correctness/queues/binheap.data
rename to calyx-py/test/correctness/queues/binheap/binheap.data
diff --git a/calyx-py/test/correctness/queues/binheap.expect b/calyx-py/test/correctness/queues/binheap/binheap.expect
similarity index 100%
rename from calyx-py/test/correctness/queues/binheap.expect
rename to calyx-py/test/correctness/queues/binheap/binheap.expect
diff --git a/calyx-py/test/correctness/queues/binheap.py b/calyx-py/test/correctness/queues/binheap/binheap.py
similarity index 100%
rename from calyx-py/test/correctness/queues/binheap.py
rename to calyx-py/test/correctness/queues/binheap/binheap.py
diff --git a/calyx-py/test/correctness/queues/binheap_fifo.data b/calyx-py/test/correctness/queues/binheap/fifo.data
similarity index 100%
rename from calyx-py/test/correctness/queues/binheap_fifo.data
rename to calyx-py/test/correctness/queues/binheap/fifo.data
diff --git a/calyx-py/test/correctness/queues/binheap_fifo.expect b/calyx-py/test/correctness/queues/binheap/fifo.expect
similarity index 100%
rename from calyx-py/test/correctness/queues/binheap_fifo.expect
rename to calyx-py/test/correctness/queues/binheap/fifo.expect
diff --git a/calyx-py/test/correctness/queues/binheap_fifo.py b/calyx-py/test/correctness/queues/binheap/fifo.py
similarity index 100%
rename from calyx-py/test/correctness/queues/binheap_fifo.py
rename to calyx-py/test/correctness/queues/binheap/fifo.py
diff --git a/runt.toml b/runt.toml
index a5b2622e18..637c483ef8 100644
--- a/runt.toml
+++ b/runt.toml
@@ -124,7 +124,10 @@ python3 {} |\
 
 [[tests]]
 name = "[calyx-py] queues correctness"
-paths = ["calyx-py/test/correctness/queues/*.py"]
+paths = [
+    "calyx-py/test/correctness/queues/*.py",
+    "calyx-py/test/correctness/queues/binheap/*.py"
+]
 cmd = """
 name=$(basename {} .py) &&
 dir=$(dirname {}) &&