diff --git a/fuzzers/016-clbnoutmux/generate.py b/fuzzers/016-clbnoutmux/generate.py
index ada2425b..78a6ab86 100644
--- a/fuzzers/016-clbnoutmux/generate.py
+++ b/fuzzers/016-clbnoutmux/generate.py
@@ -56,10 +56,13 @@ for l in f:
     # remove this MUX from the cache, preventing generation of 0-tags for this MUX
     cache[loc].remove(which)
 
+    # O6 hack per https://github.com/SymbiFlow/prjxray/issues/243
+    segmk.add_site_tag(loc, "%sOUTMUX.%s" % (which, "O6"), src == "O5")
+
 # create 0-tags for all sources on the remaining (unused) MUXes
 for loc, muxes in cache.items():
     for which in muxes:
-        for src in "F7 F8 CY O5 XOR O6 5Q".split():
+        for src in "F7 F8 CY O5 XOR 5Q".split():
             if src == "F7" and which not in "AC": continue
             if src == "F8" and which not in "B": continue
             if src == "5Q": src = which + "5Q"
diff --git a/minitests/clb_noutmux/.gitignore b/fuzzers/016-clbnoutmux/minitest/.gitignore
similarity index 100%
rename from minitests/clb_noutmux/.gitignore
rename to fuzzers/016-clbnoutmux/minitest/.gitignore
diff --git a/fuzzers/016-clbnoutmux/minitest/Makefile b/fuzzers/016-clbnoutmux/minitest/Makefile
new file mode 100644
index 00000000..6fcdd876
--- /dev/null
+++ b/fuzzers/016-clbnoutmux/minitest/Makefile
@@ -0,0 +1 @@
+include $(XRAY_DIR)/minitests/util/common.mk
diff --git a/minitests/clb_noutmux/README.md b/fuzzers/016-clbnoutmux/minitest/README.md
similarity index 100%
rename from minitests/clb_noutmux/README.md
rename to fuzzers/016-clbnoutmux/minitest/README.md
diff --git a/minitests/clb_noutmux/top.v b/fuzzers/016-clbnoutmux/minitest/top.v
similarity index 100%
rename from minitests/clb_noutmux/top.v
rename to fuzzers/016-clbnoutmux/minitest/top.v
diff --git a/minitests/clb_noutmux/Makefile b/minitests/clb_noutmux/Makefile
deleted file mode 100644
index 1d13e215..00000000
--- a/minitests/clb_noutmux/Makefile
+++ /dev/null
@@ -1 +0,0 @@
-include ../util/common.mk