diff --git a/tests/postgresql/recipes/enum/db_model.h b/tests/postgresql/recipes/enum/db_model.h
index 525d7c2f..5efb0678 100644
--- a/tests/postgresql/recipes/enum/db_model.h
+++ b/tests/postgresql/recipes/enum/db_model.h
@@ -3,12 +3,15 @@
 // clang-format off
 // generated by ./scripts/sqlpp23-ddl2cpp --path-to-ddl tests/postgresql/recipes/enum/db_model.sql --path-to-header tests/postgresql/recipes/enum/db_model.h --namespace test --assume-auto-id --generate-table-creation-helper
 
-#include <optional>
-
-#include <sqlpp23/core/basic/table.h>
-#include <sqlpp23/core/basic/table_columns.h>
-#include <sqlpp23/core/name/create_name_tag.h>
-#include <sqlpp23/core/type_traits.h>
+// The following auto-generated includes have been commented out manually to work around GCC bug
+// https://gcc.gnu.org/bugzilla/show_bug.cgi?id=99000
+//
+// #include <optional>
+//
+// #include <sqlpp23/core/basic/table.h>
+// #include <sqlpp23/core/basic/table_columns.h>
+// #include <sqlpp23/core/name/create_name_tag.h>
+// #include <sqlpp23/core/type_traits.h>
 
 namespace test {
   template<typename Db>
diff --git a/tests/postgresql/recipes/enum/main.cpp b/tests/postgresql/recipes/enum/main.cpp
index 9da4c716..0a225e33 100644
--- a/tests/postgresql/recipes/enum/main.cpp
+++ b/tests/postgresql/recipes/enum/main.cpp
@@ -28,6 +28,9 @@
 //
 // For details on the actual pattern see /docs/recipes/enum.md
 
+#include <ranges>
+#include <utility>
+
 #include <sqlpp23/tests/postgresql/all.h>
 
 // The enum definitions must be included before the database model
@@ -35,8 +38,6 @@
 #include <enum_shape.h>
 #include <db_model.h>
 
-#include <ranges>
-
 namespace sql = ::sqlpp::postgresql;
 
 void test_enum_rw(sql::connection& db) {
@@ -49,7 +50,6 @@ void test_enum_rw(sql::connection& db) {
       {animal::cat, shape::circle},
       {animal::dog, shape::square},
       {static_cast<animal>(10), shape::circle}};
-  std::ranges::sort(val_write);
   // Write the enums vector to the database
   delete_from(te);
   for (const auto v : val_write) {