diff --git a/tests/test-db-copy-mgr.cpp b/tests/test-db-copy-mgr.cpp
index 9d6bdedfa..de7fdb68a 100644
--- a/tests/test-db-copy-mgr.cpp
+++ b/tests/test-db-copy-mgr.cpp
@@ -158,15 +158,15 @@ TEST_CASE("copy_mgr_t")
                         "\"rr\rrr\",\"s\\\\l\"}"});
 
         auto c = db.connect();
-        CHECK(c.require_scalar<std::string>("SELECT a[4] from test_copy_mgr") ==
+        CHECK(c.require_scalar<std::string>("SELECT a[4] FROM test_copy_mgr") ==
               "with \"quote\"");
-        CHECK(c.require_scalar<std::string>("SELECT a[5] from test_copy_mgr") ==
+        CHECK(c.require_scalar<std::string>("SELECT a[5] FROM test_copy_mgr") ==
               "the\t");
-        CHECK(c.require_scalar<std::string>("SELECT a[6] from test_copy_mgr") ==
+        CHECK(c.require_scalar<std::string>("SELECT a[6] FROM test_copy_mgr") ==
               "line\nbreak");
-        CHECK(c.require_scalar<std::string>("SELECT a[7] from test_copy_mgr") ==
+        CHECK(c.require_scalar<std::string>("SELECT a[7] FROM test_copy_mgr") ==
               "rr\rrr");
-        CHECK(c.require_scalar<std::string>("SELECT a[8] from test_copy_mgr") ==
+        CHECK(c.require_scalar<std::string>("SELECT a[8] FROM test_copy_mgr") ==
               "s\\l");
     }
 
diff --git a/tests/test-options-projection.cpp b/tests/test-options-projection.cpp
index 2c56f1f8d..9719e4faa 100644
--- a/tests/test-options-projection.cpp
+++ b/tests/test-options-projection.cpp
@@ -74,5 +74,5 @@ TEST_CASE("Projection setup")
     auto conn = db.connect();
 
     CHECK(conn.require_scalar<std::string>(
-              "select find_srid('public', 'planet_osm_roads', 'way')") == srid);
+              "SELECT find_srid('public', 'planet_osm_roads', 'way')") == srid);
 }
diff --git a/tests/test-output-multi-poly-trivial.cpp b/tests/test-output-multi-poly-trivial.cpp
index 00c276d57..66af1190a 100644
--- a/tests/test-output-multi-poly-trivial.cpp
+++ b/tests/test-output-multi-poly-trivial.cpp
@@ -27,8 +27,8 @@ TEST_CASE("multi backend trivial polygon import")
         // although there are 2 rows, they should both be 5-pointed polygons (note
         // that it's 5 points including the duplicated first/last point)
         REQUIRE(5 == conn.require_scalar<int>(
-                         "select distinct st_numpoints(st_exteriorring(way)) "
-                         "from test_poly"));
+                         "SELECT DISTINCT ST_NumPoints(ST_ExteriorRing(way)) "
+                         "FROM test_poly"));
     }
 
     SECTION("With multi-polygons")
@@ -49,10 +49,10 @@ TEST_CASE("multi backend trivial polygon import")
         // it's 5 points including the duplicated first/last point)
         REQUIRE(2 ==
                 conn.get_count(
-                    "(select (st_dump(way)).geom as way from test_poly) x"));
+                    "(SELECT (ST_Dump(way)).geom AS way FROM test_poly) x"));
         REQUIRE(5 ==
                 conn.require_scalar<int>(
-                    "select distinct st_numpoints(st_exteriorring(way)) from "
-                    "(select (st_dump(way)).geom as way from test_poly) x"));
+                    "SELECT DISTINCT ST_NumPoints(ST_ExteriorRing(way)) FROM "
+                    "(SELECT (ST_Dump(way)).geom AS way FROM test_poly) x"));
     }
 }