diff --git a/testdata/scad/misc/nbsp-latin1-test.scad b/testdata/scad/misc/nbsp-latin1-test.scad
new file mode 100644
index 00000000..3d8bbfe9
--- /dev/null
+++ b/testdata/scad/misc/nbsp-latin1-test.scad
@@ -0,0 +1,2 @@
+a = 1;   // Latin-1 NBSP (no-break space)
+echo(a);
diff --git a/testdata/scad/misc/nbsp-utf8-test.scad b/testdata/scad/misc/nbsp-utf8-test.scad
new file mode 100644
index 00000000..fd929422
--- /dev/null
+++ b/testdata/scad/misc/nbsp-utf8-test.scad
@@ -0,0 +1,2 @@
+a = 1;   // UTF-8 NBSP (no-break space)
+echo(a);
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 9ab9c56d..f8546e4f 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1074,6 +1074,8 @@ list(APPEND ECHO_FILES ${FUNCTION_FILES}
             ${CMAKE_SOURCE_DIR}/../testdata/scad/misc/no-break-space-test.scad
             ${CMAKE_SOURCE_DIR}/../testdata/scad/misc/unicode-tests.scad
             ${CMAKE_SOURCE_DIR}/../testdata/scad/misc/utf8-tests.scad
+            ${CMAKE_SOURCE_DIR}/../testdata/scad/misc/nbsp-utf8-test.scad
+            ${CMAKE_SOURCE_DIR}/../testdata/scad/misc/nbsp-latin1-test.scad
             ${CMAKE_SOURCE_DIR}/../testdata/scad/misc/concat-tests.scad
             ${CMAKE_SOURCE_DIR}/../testdata/scad/misc/include-tests.scad
             ${CMAKE_SOURCE_DIR}/../testdata/scad/misc/include-recursive-test.scad
diff --git a/tests/regression/echotest/nbsp-latin1-test-expected.echo b/tests/regression/echotest/nbsp-latin1-test-expected.echo
new file mode 100644
index 00000000..ee62791e
--- /dev/null
+++ b/tests/regression/echotest/nbsp-latin1-test-expected.echo
@@ -0,0 +1 @@
+ECHO: 1
diff --git a/tests/regression/echotest/nbsp-utf8-test-expected.echo b/tests/regression/echotest/nbsp-utf8-test-expected.echo
new file mode 100644
index 00000000..ee62791e
--- /dev/null
+++ b/tests/regression/echotest/nbsp-utf8-test-expected.echo
@@ -0,0 +1 @@
+ECHO: 1