diff --git a/ports/stm32/boards/PYBD_SF2/manifest.py b/ports/stm32/boards/PYBD_SF2/manifest.py
index e4736f693a..a9e92848d5 100644
--- a/ports/stm32/boards/PYBD_SF2/manifest.py
+++ b/ports/stm32/boards/PYBD_SF2/manifest.py
@@ -1,2 +1,3 @@
 include("$(PORT_DIR)/boards/manifest.py")
+include("$(PORT_DIR)/boards/manifest_pyboard.py")
 include("$(MPY_DIR)/extmod/webrepl")
diff --git a/ports/stm32/boards/PYBLITEV10/mpconfigboard.mk b/ports/stm32/boards/PYBLITEV10/mpconfigboard.mk
index 8aeaf0e40c..7469866476 100644
--- a/ports/stm32/boards/PYBLITEV10/mpconfigboard.mk
+++ b/ports/stm32/boards/PYBLITEV10/mpconfigboard.mk
@@ -24,3 +24,6 @@ endif
 ifeq ($(BOARD_VARIANT),"network")
 MICROPY_PY_NETWORK_WIZNET5K=5200
 endif
+
+# PYB-specific frozen modules
+FROZEN_MANIFEST ?= boards/PYBV10/manifest.py
diff --git a/ports/stm32/boards/PYBV10/manifest.py b/ports/stm32/boards/PYBV10/manifest.py
new file mode 100644
index 0000000000..ec0d4a26b7
--- /dev/null
+++ b/ports/stm32/boards/PYBV10/manifest.py
@@ -0,0 +1,2 @@
+include("$(PORT_DIR)/boards/manifest.py")
+include("$(PORT_DIR)/boards/manifest_pyboard.py")
diff --git a/ports/stm32/boards/PYBV10/mpconfigboard.mk b/ports/stm32/boards/PYBV10/mpconfigboard.mk
index 97af22b5e1..af28782678 100644
--- a/ports/stm32/boards/PYBV10/mpconfigboard.mk
+++ b/ports/stm32/boards/PYBV10/mpconfigboard.mk
@@ -34,3 +34,6 @@ endif
 ifeq ($(BOARD_VARIANT),"network")
 MICROPY_PY_NETWORK_WIZNET5K=5200
 endif
+
+# PYB-specific frozen modules
+FROZEN_MANIFEST ?= $(BOARD_DIR)/manifest.py
diff --git a/ports/stm32/boards/PYBV11/mpconfigboard.mk b/ports/stm32/boards/PYBV11/mpconfigboard.mk
index 97af22b5e1..cf7884cfc6 100644
--- a/ports/stm32/boards/PYBV11/mpconfigboard.mk
+++ b/ports/stm32/boards/PYBV11/mpconfigboard.mk
@@ -34,3 +34,6 @@ endif
 ifeq ($(BOARD_VARIANT),"network")
 MICROPY_PY_NETWORK_WIZNET5K=5200
 endif
+
+# PYB-specific frozen modules
+FROZEN_MANIFEST ?= boards/PYBV10/manifest.py
diff --git a/ports/stm32/boards/manifest.py b/ports/stm32/boards/manifest.py
index 4bb224e2d8..723caa3eb6 100644
--- a/ports/stm32/boards/manifest.py
+++ b/ports/stm32/boards/manifest.py
@@ -1,5 +1,4 @@
 include("$(MPY_DIR)/extmod/uasyncio")
 
 include("$(MPY_DIR)/drivers/dht")
-include("$(MPY_DIR)/drivers/display", lcd160cr=True, test=True)
 include("$(MPY_DIR)/drivers/onewire", ds18x20=False)
diff --git a/ports/stm32/boards/manifest_pyboard.py b/ports/stm32/boards/manifest_pyboard.py
new file mode 100644
index 0000000000..e4fb0a8c4d
--- /dev/null
+++ b/ports/stm32/boards/manifest_pyboard.py
@@ -0,0 +1 @@
+include("$(MPY_DIR)/drivers/display", lcd160cr=True)