diff --git a/test/unit_test/runtime/fmt_test.cpp b/test/unit_test/runtime/fmt_test.cpp
index a72ee604c..7dab307b 100644
--- a/test/unit_test/runtime/fmt_test.cpp
+++ b/test/unit_test/runtime/fmt_test.cpp
@@ -230,7 +230,7 @@ TEST_CASE("operator<< on a quantity", "[text][ostream][fmt]")
 
         SECTION("iostream")
         {
-          CHECK(stream.str() == "10.q_km/h");
+          CHECK(stream.str() == "10 km/h");
         }
 
         SECTION("fmt with default format {} on a quantity")
@@ -709,7 +709,7 @@ TEST_CASE("%q an %Q can be put anywhere in a format string", "[text][fmt]")
 {
   SECTION("no space")
   {
-    CHECK(fmt::format("{:%Q%q}", 123q_kmph) == "123q_km/h");
+    CHECK(fmt::format("{:%Q%q}", 123q_kmph) == "123km/h");
   }
 
   SECTION("separator")
@@ -754,14 +754,14 @@ TEST_CASE("fill and align specification", "[text][fmt]")
 
   SECTION("full format {:%Q %q} on a quantity")
   {
-    CHECK(fmt::format("|{:0%Q%q}|", 123q_m) == "|123q_m|");
-    CHECK(fmt::format("|{:10%Q%q}|", 123q_m) == "|      123q_m|");
-    CHECK(fmt::format("|{:<10%Q%q}|", 123q_m) == "|123q_m      |");
-    CHECK(fmt::format("|{:>10%Q%q}|", 123q_m) == "|      123q_m|");
-    CHECK(fmt::format("|{:^10%Q%q}|", 123q_m) == "|   123q_m   |");
-    CHECK(fmt::format("|{:*<10%Q%q}|", 123q_m) == "|123q_m******|");
-    CHECK(fmt::format("|{:*>10%Q%q}|", 123q_m) == "|******123q_m|");
-    CHECK(fmt::format("|{:*^10%Q%q}|", 123q_m) == "|***123q_m***|");
+    CHECK(fmt::format("|{:0%Q%q}|", 123q_m) == "|123m|");
+    CHECK(fmt::format("|{:10%Q%q}|", 123q_m) == "|      123m|");
+    CHECK(fmt::format("|{:<10%Q%q}|", 123q_m) == "|123m      |");
+    CHECK(fmt::format("|{:>10%Q%q}|", 123q_m) == "|      123m|");
+    CHECK(fmt::format("|{:^10%Q%q}|", 123q_m) == "|   123m   |");
+    CHECK(fmt::format("|{:*<10%Q%q}|", 123q_m) == "|123m******|");
+    CHECK(fmt::format("|{:*>10%Q%q}|", 123q_m) == "|******123m|");
+    CHECK(fmt::format("|{:*^10%Q%q}|", 123q_m) == "|***123m***|");
   }
 
   SECTION("value only format {:%Q} on a quantity")
@@ -804,8 +804,8 @@ TEST_CASE("sign specification", "[text][fmt]")
 
   SECTION("full format {:%Q %q} on a quantity")
   {
-    CHECK(fmt::format("{0:%Q%q},{0:+%Q%q},{0:-%Q%q},{0: %Q%q}", 1q_m) == "1q_m,+1q_m,1q_m, 1q_m");
-    CHECK(fmt::format("{0:%Q%q},{0:+%Q%q},{0:-%Q%q},{0: %Q%q}", -1q_m) == "-1q_m,-1q_m,-1q_m,-1q_m");
+    CHECK(fmt::format("{0:%Q%q},{0:+%Q%q},{0:-%Q%q},{0: %Q%q}", 1q_m) == "1m,+1m,1m, 1m");
+    CHECK(fmt::format("{0:%Q%q},{0:+%Q%q},{0:-%Q%q},{0: %Q%q}", -1q_m) == "-1m,-1m,-1m,-1m");
     CHECK(fmt::format("{0:%Q%q},{0:+%Q%q},{0:-%Q%q},{0: %Q%q}", inf) == "infm,+infm,infm, infm");
     CHECK(fmt::format("{0:%Q%q},{0:+%Q%q},{0:-%Q%q},{0: %Q%q}", nan) == "nanm,+nanm,nanm, nanm");
   }
@@ -895,19 +895,19 @@ TEST_CASE("quantity_cast", "[text][ostream]")
     SECTION("original")
     {
       stream << q;
-      CHECK(stream.str() == "60.q_km/h");
+      CHECK(stream.str() == "60 km/h");
     }
 
     SECTION("int")
     {
       stream << quantity_cast<int>(q);
-      CHECK(stream.str() == "60.q_km/h");
+      CHECK(stream.str() == "60 km/h");
     }
 
     SECTION("double")
     {
       stream << quantity_cast<double>(q);
-      CHECK(stream.str() == "60.q_km/h");
+      CHECK(stream.str() == "60 km/h");
     }
   }
 
@@ -918,19 +918,19 @@ TEST_CASE("quantity_cast", "[text][ostream]")
     SECTION("original")
     {
       stream << q;
-      CHECK(stream.str() == "60.5.q_km/h");
+      CHECK(stream.str() == "60.5 km/h");
     }
 
     SECTION("int")
     {
       stream << quantity_cast<int>(q);
-      CHECK(stream.str() == "60.q_km/h");
+      CHECK(stream.str() == "60 km/h");
     }
 
     SECTION("double")
     {
       stream << quantity_cast<double>(q);
-      CHECK(stream.str() == "60.5.q_km/h");
+      CHECK(stream.str() == "60.5 km/h");
     }
   }
 }
diff --git a/test/unit_test/runtime/fmt_units_test.cpp b/test/unit_test/runtime/fmt_units_test.cpp
index cdb9db30..22cd75a5 100644
--- a/test/unit_test/runtime/fmt_units_test.cpp
+++ b/test/unit_test/runtime/fmt_units_test.cpp
@@ -60,7 +60,7 @@ TEST_CASE("fmt::format on synthesized unit symbols", "[text][fmt]")
   {
     CHECK(fmt::format("{}", 1q_mm) == "1 mm");
     CHECK(fmt::format("{}", 1q_cm) == "1 cm");
-    CHECK(fmt::format("{}", 1q_km) == "1.q_km");
+    CHECK(fmt::format("{}", 1q_km) == "1 km");
     CHECK(fmt::format("{}", 1q_ft) == "1 ft");
     CHECK(fmt::format("{}", 1q_ft_us) == "1 ft(us)");
     CHECK(fmt::format("{}", 1q_yd) == "1 yd");
@@ -94,7 +94,7 @@ TEST_CASE("fmt::format on synthesized unit symbols", "[text][fmt]")
     CHECK(fmt::format("{}", 1q_m2) == "1 m²");
     CHECK(fmt::format("{}", 1q_mm2) == "1 mm²");
     CHECK(fmt::format("{}", 1q_cm2) == "1 cm²");
-    CHECK(fmt::format("{}", 1q_km2) == "1.q_km²");
+    CHECK(fmt::format("{}", 1q_km2) == "1 km²");
     CHECK(fmt::format("{}", 1q_ft2) == "1 ft²");
   }
 
@@ -125,7 +125,7 @@ TEST_CASE("fmt::format on synthesized unit symbols", "[text][fmt]")
     CHECK(fmt::format("{}", 1q_m3) == "1 m³");
     CHECK(fmt::format("{}", 1q_mm3) == "1 mm³");
     CHECK(fmt::format("{}", 1q_cm3) == "1 cm³");
-    CHECK(fmt::format("{}", 1q_km3) == "1.q_km³");
+    CHECK(fmt::format("{}", 1q_km3) == "1 km³");
     CHECK(fmt::format("{}", 1q_ft3) == "1 ft³");
   }
 
@@ -141,7 +141,7 @@ TEST_CASE("fmt::format on synthesized unit symbols", "[text][fmt]")
   SECTION("velocity")
   {
     CHECK(fmt::format("{}", 1q_mps) == "1 m/s");
-    CHECK(fmt::format("{}", 1q_kmph) == "1.q_km/h");
+    CHECK(fmt::format("{}", 1q_kmph) == "1 km/h");
     CHECK(fmt::format("{}", 1q_mph) == "1 mi/h");
   }