diff --git a/Makefile b/Makefile
index 507d46f230d..1e6e92ab796 100644
--- a/Makefile
+++ b/Makefile
@@ -878,6 +878,7 @@ endif
 	+cd tests/arch/anlogic && bash run-test.sh $(SEEDOPT)
 	+cd tests/arch/gowin && bash run-test.sh $(SEEDOPT)
 	+cd tests/arch/intel_alm && bash run-test.sh $(SEEDOPT)
+	+cd tests/arch/nanoxplore && bash run-test.sh $(SEEDOPT)
 	+cd tests/arch/nexus && bash run-test.sh $(SEEDOPT)
 	+cd tests/arch/quicklogic/pp3 && bash run-test.sh $(SEEDOPT)
 	+cd tests/arch/quicklogic/qlf_k6n10f && bash run-test.sh $(SEEDOPT)
diff --git a/tests/arch/nanoxplore/adffs.ys b/tests/arch/nanoxplore/adffs.ys
index 6a4f63ad7c7..9f4e1fac786 100644
--- a/tests/arch/nanoxplore/adffs.ys
+++ b/tests/arch/nanoxplore/adffs.ys
@@ -30,8 +30,9 @@ equiv_opt -async2sync -assert -map +/nanoxplore/cells_sim.v synth_nanoxplore # e
 design -load postopt # load the post-opt design (otherwise equiv_opt loads the pre-opt design)
 cd dffs # Constrain all select calls below inside the top module
 select -assert-count 1 t:NX_DFF
+select -assert-count 1 t:NX_LUT
 
-select -assert-none t:NX_DFF %% t:* %D
+select -assert-none t:NX_DFF t:NX_LUT %% t:* %D
 
 
 design -load read
diff --git a/tests/arch/nanoxplore/dffs.ys b/tests/arch/nanoxplore/dffs.ys
index ba7dff41c46..898765408c0 100644
--- a/tests/arch/nanoxplore/dffs.ys
+++ b/tests/arch/nanoxplore/dffs.ys
@@ -17,6 +17,5 @@ equiv_opt -assert -async2sync -map +/nanoxplore/cells_sim.v synth_nanoxplore # e
 design -load postopt # load the post-opt design (otherwise equiv_opt loads the pre-opt design)
 cd dffe # Constrain all select calls below inside the top module
 select -assert-count 1 t:NX_DFF
-select -assert-count 1 t:NX_LUT
 
-select -assert-none t:NX_DFF t:NX_LUT %% t:* %D
+select -assert-none t:NX_DFF %% t:* %D
diff --git a/tests/arch/nanoxplore/fsm.ys b/tests/arch/nanoxplore/fsm.ys
index ee00be4e1bd..8582d111c23 100644
--- a/tests/arch/nanoxplore/fsm.ys
+++ b/tests/arch/nanoxplore/fsm.ys
@@ -12,5 +12,5 @@ design -load postopt # load the post-opt design (otherwise equiv_opt loads the p
 cd fsm # Constrain all select calls below inside the top module
 
 select -assert-count 6 t:NX_DFF
-select -assert-count 13 t:NX_LUT
+select -assert-count 14 t:NX_LUT
 select -assert-none t:NX_DFF t:NX_LUT %% t:* %D
diff --git a/tests/arch/nanoxplore/latches.ys b/tests/arch/nanoxplore/latches.ys
index 32609dbce40..4625348f916 100644
--- a/tests/arch/nanoxplore/latches.ys
+++ b/tests/arch/nanoxplore/latches.ys
@@ -6,9 +6,9 @@ proc
 # Can't run any sort of equivalence check because latches are blown to LUTs
 synth_nanoxplore
 cd latchp # Constrain all select calls below inside the top module
-select -assert-count 1 t:NX_DFF
+select -assert-count 1 t:NX_LUT
 
-select -assert-none t:NX_DFF %% t:* %D
+select -assert-none t:NX_LUT %% t:* %D
 
 
 design -load read
@@ -18,9 +18,8 @@ proc
 synth_nanoxplore
 cd latchn # Constrain all select calls below inside the top module
 select -assert-count 1 t:NX_LUT
-select -assert-count 1 t:NX_DFF
 
-select -assert-none t:NX_LUT t:NX_DFF %% t:* %D
+select -assert-none t:NX_LUT %% t:* %D
 
 
 design -load read
@@ -30,6 +29,5 @@ proc
 synth_nanoxplore
 cd latchsr # Constrain all select calls below inside the top module
 select -assert-count 2 t:NX_LUT
-select -assert-count 1 t:NX_DFF
 
-select -assert-none t:NX_LUT t:NX_DFF %% t:* %D
+select -assert-none t:NX_LUT %% t:* %D