diff --git a/ueforth/common/forth_namespace_tests.fs b/ueforth/common/forth_namespace_tests.fs
index a1f618f..3cc5923 100644
--- a/ueforth/common/forth_namespace_tests.fs
+++ b/ueforth/common/forth_namespace_tests.fs
@@ -390,6 +390,8 @@ e: check-phase1
   check-vocabulary
   check-[]conds
   check-boot
+  check-core-opcodes
+  check-float-opcodes
 ;e
 
 e: check-desktop
@@ -436,8 +438,6 @@ e: test-windows-forth-namespace
   out: default-type 
   out: windows 
   check-phase1
-  check-core-opcodes
-  check-float-opcodes
   out: LOADLIBRARYA 
   out: GETPROCADDRESS 
 ;e
@@ -482,8 +482,6 @@ e: test-posix-forth-namespace
   out: default-type 
   out: posix 
   check-phase1
-  check-core-opcodes
-  check-float-opcodes
   out: DLSYM 
 ;e 
 
@@ -604,9 +602,7 @@ e: test-esp32-forth-namespace
   check-phase2
   check-allocation
   check-phase1
-  check-core-opcodes
   check-esp32-basics2
-  check-float-opcodes
 ;e 
 
 [THEN] [THEN] 
diff --git a/ueforth/esp32/builtins.h b/ueforth/esp32/builtins.h
index a59bf2c..0fae2af 100644
--- a/ueforth/esp32/builtins.h
+++ b/ueforth/esp32/builtins.h
@@ -37,7 +37,7 @@ static cell_t ResizeFile(cell_t fd, cell_t size);
 #endif
 
 #define PLATFORM_OPCODE_LIST \
-  FLOATING_POINT_LIST \
+  USER_WORDS \
   REQUIRED_MEMORY_SUPPORT \
   REQUIRED_SERIAL_SUPPORT \
   REQUIRED_ARDUINO_GPIO_SUPPORT \
@@ -60,7 +60,7 @@ static cell_t ResizeFile(cell_t fd, cell_t size);
   OPTIONAL_RMT_SUPPORT \
   OPTIONAL_OLED_SUPPORT \
   OPTIONAL_SPI_FLASH_SUPPORT \
-  USER_WORDS
+  FLOATING_POINT_LIST
 
 #define REQUIRED_MEMORY_SUPPORT \
   Y(MALLOC, SET malloc(n0)) \
diff --git a/ueforth/esp32/sim_main.cpp b/ueforth/esp32/sim_main.cpp
index 487188c..ff9aeba 100644
--- a/ueforth/esp32/sim_main.cpp
+++ b/ueforth/esp32/sim_main.cpp
@@ -23,8 +23,8 @@
 static cell_t *simulated(cell_t *sp, const char *op);
 
 #define PLATFORM_OPCODE_LIST \
-  FLOATING_POINT_LIST \
-  PLATFORM_SIMULATED_OPCODE_LIST
+  PLATFORM_SIMULATED_OPCODE_LIST \
+  FLOATING_POINT_LIST
 
 #include "gen/esp32_sim_opcodes.h"
 
diff --git a/ueforth/posix/main.c b/ueforth/posix/main.c
index e80d89c..9f2fa33 100644
--- a/ueforth/posix/main.c
+++ b/ueforth/posix/main.c
@@ -25,8 +25,8 @@
 
 #define PLATFORM_OPCODE_LIST \
   Y(DLSYM, tos = (cell_t) dlsym(a1, c0); --sp) \
-  FLOATING_POINT_LIST \
   CALLING_OPCODE_LIST \
+  FLOATING_POINT_LIST
 
 #include "common/core.h"
 #include "common/interp.h"
diff --git a/ueforth/windows/main.c b/ueforth/windows/main.c
index 00e7c8b..96a1464 100644
--- a/ueforth/windows/main.c
+++ b/ueforth/windows/main.c
@@ -40,8 +40,8 @@
       tos = (cell_t) GetProcAddress((HMODULE) *sp, (LPCSTR) tos); --sp) \
   Y(LOADLIBRARYA, \
       tos = (cell_t) LoadLibraryA((LPCSTR) tos)) \
-  FLOATING_POINT_LIST \
   CALLING_OPCODE_LIST \
+  FLOATING_POINT_LIST
 
 #include "common/core.h"
 #include "windows/interp.h"