diff --git a/test/test_ccaosdb.cpp b/test/test_ccaosdb.cpp
index 71c2a829316b5b5418702686c6ea0fdfa48e5198..c09775311f5512269b852e4b5aaeb6df2578ccaa 100644
--- a/test/test_ccaosdb.cpp
+++ b/test/test_ccaosdb.cpp
@@ -21,11 +21,12 @@
  */
 
 #include "caosdb/configuration.h"
-#include "caosdb/status_code.h"    // for StatusCode
-#include "caosdb_test_utility.h"   // for EXPECT_THROW_MESSAGE, TEST_DATA_DIR
-#include "ccaosdb.h"               // for caosdb_utility_get_env_fallback
-#include <cstdint>                 // for int64_t
-#include <cstring>                 // for strcmp
+#include "caosdb/status_code.h"  // for StatusCode
+#include "caosdb_test_utility.h" // for EXPECT_THROW_MESSAGE, TEST_DATA_DIR
+#include "ccaosdb.h"             // for caosdb_utility_get_env_fallback
+#include <cstdint>               // for int64_t
+#include <cstring>               // for strcmp
+#include <gtest/gtest.h>
 #include <gtest/gtest-message.h>   // for Message
 #include <gtest/gtest-test-part.h> // for SuiteApiResolver, TestFactoryImpl
 #include <gtest/gtest_pred_impl.h> // for Test, TestInfo, EXPECT_EQ, TEST
diff --git a/test/test_configuration.cpp b/test/test_configuration.cpp
index 6d5f2e9449e5be21452fdcca6a04f4e02f531d13..2f5e754b83ad5be6903deb6f521190f07911f9b6 100644
--- a/test/test_configuration.cpp
+++ b/test/test_configuration.cpp
@@ -19,11 +19,12 @@
  * along with this program. If not, see <https://www.gnu.org/licenses/>.
  *
  */
-#include "caosdb/configuration.h"  // for ConfigurationError, Configuration...
-#include "caosdb/exceptions.h"     // for ConfigurationError
-#include "caosdb/log_level.h"      // for CAOSDB_DEFAULT_LOG_LEVEL, CAOSDB_...
-#include "caosdb/logging.h"        // for ConsoleSinkConfiguration, Logging...
-#include "caosdb_test_utility.h"   // for EXPECT_THROW_MESSAGE, TEST_DATA_DIR
+#include "caosdb/configuration.h" // for ConfigurationError, Configuration...
+#include "caosdb/exceptions.h"    // for ConfigurationError
+#include "caosdb/log_level.h"     // for CAOSDB_DEFAULT_LOG_LEVEL, CAOSDB_...
+#include "caosdb/logging.h"       // for ConsoleSinkConfiguration, Logging...
+#include "caosdb_test_utility.h"  // for EXPECT_THROW_MESSAGE, TEST_DATA_DIR
+#include <gtest/gtest.h>
 #include <gtest/gtest-message.h>   // for Message
 #include <gtest/gtest-test-part.h> // for TestPartResult, SuiteApiResolver
 #include <gtest/gtest_pred_impl.h> // for TestInfo, TEST_F, Test
diff --git a/test/test_connection.cpp b/test/test_connection.cpp
index 9b8783a0ae88f6669de4e5ec4e5a43dea26447c5..29339b5d6e6bec03052a62bf3e65fd5911946a23 100644
--- a/test/test_connection.cpp
+++ b/test/test_connection.cpp
@@ -27,11 +27,12 @@
 #include "caosdb/connection.h"           // for ConnectionManager
 #include "caosdb/exceptions.h"           // for ConnectionConfigurationError
 #include "caosdb_test_utility.h"         // for EXPECT_THROW_MESSAGE, TEST_...
-#include <gtest/gtest-message.h>         // for Message
-#include <gtest/gtest-test-part.h>       // for SuiteApiResolver, TestPartR...
-#include <gtest/gtest_pred_impl.h>       // for AssertionResult, TestInfo
-#include <memory>                        // for allocator, operator!=, shar...
-#include <string>                        // for operator+, string
+#include <gtest/gtest.h>
+#include <gtest/gtest-message.h>   // for Message
+#include <gtest/gtest-test-part.h> // for SuiteApiResolver, TestPartR...
+#include <gtest/gtest_pred_impl.h> // for AssertionResult, TestInfo
+#include <memory>                  // for allocator, operator!=, shar...
+#include <string>                  // for operator+, string
 
 namespace caosdb::connection {
 #ifdef BUILD_ACM
diff --git a/test/test_data_type.cpp b/test/test_data_type.cpp
index 6b7b8b6ea3d36135164d73c90e8f45693a49b1cc..540b06d5d677eef0e90587ca76bc01bb14cb2ead 100644
--- a/test/test_data_type.cpp
+++ b/test/test_data_type.cpp
@@ -25,12 +25,13 @@
 #include "caosdb/entity/v1/main.pb.h" // for DataType, Ato...
 #include "caosdb/logging.h"           // for CAOSDB_LOG_DEBUG
 #include "caosdb/protobuf_helper.h"   // for CAOSDB_DEBUG_...
-#include <gtest/gtest-message.h>      // for Message
-#include <gtest/gtest-test-part.h>    // for TestPartResult, SuiteApi...
-#include <gtest/gtest_pred_impl.h>    // for AssertionResult, Test
-#include <map>                        // for map, operator!=
-#include <string>                     // for allocator
-#include <utility>                    // for pair
+#include <gtest/gtest.h>
+#include <gtest/gtest-message.h>   // for Message
+#include <gtest/gtest-test-part.h> // for TestPartResult, SuiteApi...
+#include <gtest/gtest_pred_impl.h> // for AssertionResult, Test
+#include <map>                     // for map, operator!=
+#include <string>                  // for allocator
+#include <utility>                 // for pair
 
 namespace caosdb::entity {
 using ProtoEntity = caosdb::entity::v1::Entity;
diff --git a/test/test_entity.cpp b/test/test_entity.cpp
index a42e91781922c5e8b9530663b5bdbc53d4532fe3..5122e681152ea9c5cf51826b1169a6d7c41ac872 100644
--- a/test/test_entity.cpp
+++ b/test/test_entity.cpp
@@ -31,14 +31,15 @@
 #include "caosdb/value.h"                  // for Value
 #include "caosdb_test_utility.h"           // for TEST_DATA_DIR
 #include <google/protobuf/arena.h>         // for Arena
-#include <gtest/gtest-message.h>           // for Message
-#include <gtest/gtest-test-part.h>         // for TestPartResult, Sui...
-#include <gtest/gtest_pred_impl.h>         // for Test, EXPECT_EQ
-#include <iostream>                        // for operator<<, basic_o...
-#include <memory>                          // for allocator, shared_ptr
-#include <stdexcept>                       // for out_of_range
-#include <string>                          // for operator+, to_string
-#include <utility>                         // for move
+#include <gtest/gtest.h>
+#include <gtest/gtest-message.h>   // for Message
+#include <gtest/gtest-test-part.h> // for TestPartResult, Sui...
+#include <gtest/gtest_pred_impl.h> // for Test, EXPECT_EQ
+#include <iostream>                // for operator<<, basic_o...
+#include <memory>                  // for allocator, shared_ptr
+#include <stdexcept>               // for out_of_range
+#include <string>                  // for operator+, to_string
+#include <utility>                 // for move
 // IWYU pragma: no_include "net/proto2/public/repeated_field.h"
 
 namespace caosdb::entity {
diff --git a/test/test_file_transmission.cpp b/test/test_file_transmission.cpp
index c5847a0842ae8a3bb46a8126e42b31bb5b1d6451..4a48a99f071d8603f7efa8de5de284ccd60a15a0 100644
--- a/test/test_file_transmission.cpp
+++ b/test/test_file_transmission.cpp
@@ -19,8 +19,9 @@
  */
 #include "caosdb/file_transmission/file_writer.h"
 #include "caosdb/file_transmission/file_reader.h"
-#include <chrono>                  // for filesystem
-#include <filesystem>              // for path
+#include <chrono>     // for filesystem
+#include <filesystem> // for path
+#include <gtest/gtest.h>
 #include <gtest/gtest-message.h>   // for Message
 #include <gtest/gtest-test-part.h> // for TestPartResult, SuiteApiResolver
 #include <gtest/gtest_pred_impl.h> // for Test, EXPECT_EQ, AssertionResult
diff --git a/test/test_info.cpp b/test/test_info.cpp
index 4331219ab02ae5c60e165bee7992c6466d4889f2..bc1e41784148ae3d2a14ac1e77ad23b3cdccb5ee 100644
--- a/test/test_info.cpp
+++ b/test/test_info.cpp
@@ -22,10 +22,11 @@
 
 #include "caosdb/info.h"            // for VersionInfo
 #include "caosdb/info/v1/main.pb.h" // for VersionInfo
-#include <gtest/gtest-message.h>    // for Message
-#include <gtest/gtest-test-part.h>  // for TestPartResult, SuiteApiRe...
-#include "gtest/gtest_pred_impl.h"  // for Test, EXPECT_EQ, TEST
-#include <memory>                   // for allocator
+#include <gtest/gtest.h>
+#include <gtest/gtest-message.h>   // for Message
+#include <gtest/gtest-test-part.h> // for TestPartResult, SuiteApiRe...
+#include "gtest/gtest_pred_impl.h" // for Test, EXPECT_EQ, TEST
+#include <memory>                  // for allocator
 
 namespace caosdb::info {
 using ProtoVersionInfo = caosdb::info::v1::VersionInfo;
diff --git a/test/test_issues.cpp b/test/test_issues.cpp
index 6422da5f4c86128be44286d853d768cd58db3c8c..bedb2bc2e83d88c3d352f8ab37466f19cd8f744c 100644
--- a/test/test_issues.cpp
+++ b/test/test_issues.cpp
@@ -23,10 +23,11 @@
 #include "caosdb/status_code.h"        // for StatusCode, EXECUTING
 #include "caosdb/transaction.h"        // for Transaction
 #include "caosdb/transaction_status.h" // for StatusCode
-#include <gtest/gtest-message.h>       // for Message
-#include <gtest/gtest-test-part.h>     // for SuiteApiResolver, TestPa...
-#include <gtest/gtest_pred_impl.h>     // for Test, TestInfo, TEST
-#include <memory>                      // for allocator, unique_ptr
+#include <gtest/gtest.h>
+#include <gtest/gtest-message.h>   // for Message
+#include <gtest/gtest-test-part.h> // for SuiteApiResolver, TestPa...
+#include <gtest/gtest_pred_impl.h> // for Test, TestInfo, TEST
+#include <memory>                  // for allocator, unique_ptr
 
 namespace caosdb::transaction {
 using caosdb::configuration::InsecureConnectionConfiguration;
diff --git a/test/test_list_properties.cpp b/test/test_list_properties.cpp
index 8e69ba381c20808fa4112eca06270c8bda5fa351..f2ef401b7b0433d627e4666ace115c363912a1cc 100644
--- a/test/test_list_properties.cpp
+++ b/test/test_list_properties.cpp
@@ -25,12 +25,13 @@
 #include "caosdb/entity/v1/main.pb.h" // for AtomicDataType, DataType
 #include "caosdb/value.h"             // for Value
 #include <cstdint>                    // for int64_t
-#include <gtest/gtest-message.h>      // for Message
-#include <gtest/gtest-test-part.h>    // for TestPartResult, SuiteApi...
-#include <gtest/gtest_pred_impl.h>    // for AssertionResult, Test
-#include <memory>                     // for allocator_traits<>::valu...
-#include <string>                     // for string
-#include <vector>                     // for vector
+#include <gtest/gtest.h>
+#include <gtest/gtest-message.h>   // for Message
+#include <gtest/gtest-test-part.h> // for TestPartResult, SuiteApi...
+#include <gtest/gtest_pred_impl.h> // for AssertionResult, Test
+#include <memory>                  // for allocator_traits<>::valu...
+#include <string>                  // for string
+#include <vector>                  // for vector
 
 namespace caosdb::entity {
 using ProtoEntity = caosdb::entity::v1::Entity;
diff --git a/test/test_protobuf.cpp b/test/test_protobuf.cpp
index 42e1e574437e47f0129cb30b336ab336613daede..2abb0bf32137bf010c7ef7e2fbfba12ea2b73604 100644
--- a/test/test_protobuf.cpp
+++ b/test/test_protobuf.cpp
@@ -23,10 +23,11 @@
 #include "caosdb/entity.h"            // for Entity
 #include "caosdb/entity/v1/main.pb.h" // for RepeatedPtrField, Message
 #include <google/protobuf/arena.h>    // for Arena
-#include <gtest/gtest-message.h>      // for Message
-#include <gtest/gtest-test-part.h>    // for SuiteApiResolver, TestPa...
-#include <gtest/gtest_pred_impl.h>    // for Test, TestInfo, TEST
-#include <memory>                     // for allocator
+#include <gtest/gtest.h>
+#include <gtest/gtest-message.h>   // for Message
+#include <gtest/gtest-test-part.h> // for SuiteApiResolver, TestPa...
+#include <gtest/gtest_pred_impl.h> // for Test, TestInfo, TEST
+#include <memory>                  // for allocator
 
 namespace caosdb {
 using ProtoEntity = caosdb::entity::v1::Entity;
diff --git a/test/test_transaction.cpp b/test/test_transaction.cpp
index ed4dcd2aa72e3e857bc871f401504147b330385b..47b2cb0f8b3433e6229f03863dd00951ca244b17 100644
--- a/test/test_transaction.cpp
+++ b/test/test_transaction.cpp
@@ -30,14 +30,15 @@
 #include "caosdb_test_utility.h"        // for EXPECT_THROW_MESSAGE
 #include <algorithm>                    // for max
 #include <google/protobuf/arena.h>      // for Arena
-#include <gtest/gtest-message.h>        // for Message
-#include <gtest/gtest-test-part.h>      // for SuiteApiResolver, TestPa...
-#include <gtest/gtest_pred_impl.h>      // for Test, TestInfo, TEST
-#include <memory>                       // for allocator, unique_ptr
-#include <stdexcept>                    // for out_of_range
-#include <string>                       // for string, basic_string
-#include <utility>                      // for move
-#include <vector>                       // for vector
+#include <gtest/gtest.h>
+#include <gtest/gtest-message.h>   // for Message
+#include <gtest/gtest-test-part.h> // for SuiteApiResolver, TestPa...
+#include <gtest/gtest_pred_impl.h> // for Test, TestInfo, TEST
+#include <memory>                  // for allocator, unique_ptr
+#include <stdexcept>               // for out_of_range
+#include <string>                  // for string, basic_string
+#include <utility>                 // for move
+#include <vector>                  // for vector
 // IWYU pragma: no_include "net/proto2/public/repeated_field.h"
 
 namespace caosdb::transaction {
diff --git a/test/test_user.cpp b/test/test_user.cpp
index 5715833d0f23c5e8b887a8198fe5f96324dcafd8..8dcef60623f69b0c89c1d14fc2f16d4c513abeeb 100644
--- a/test/test_user.cpp
+++ b/test/test_user.cpp
@@ -20,7 +20,8 @@
  *
  */
 
-#include "caosdb/acm/user.h"       // for User
+#include "caosdb/acm/user.h" // for User
+#include <gtest/gtest.h>
 #include <gtest/gtest-message.h>   // for Message
 #include <gtest/gtest-test-part.h> // for TestPartResult, SuiteApiRe...
 #include <gtest/gtest_pred_impl.h> // for Test, EXPECT_EQ, TEST
diff --git a/test/test_utility.cpp b/test/test_utility.cpp
index 74db29afa798ccdbf9d4be45497e1a44762d630d..8db42b4991e0b643ecaf04b6e5fcf3d06d38e9bf 100644
--- a/test/test_utility.cpp
+++ b/test/test_utility.cpp
@@ -26,13 +26,14 @@
 #include "caosdb/status_code.h"               // for get_status_description
 #include "caosdb/utility.h"                   // for base64_encode, load_js...
 #include "caosdb_test_utility.h"              // for TEST_DATA_DIR
-#include <gtest/gtest-message.h>              // for Message
-#include <gtest/gtest-test-part.h>            // for TestPartResult, SuiteA...
-#include <gtest/gtest_pred_impl.h>            // for Test, EXPECT_EQ, TestInfo
-#include <map>                                // for map, operator!=, _Rb_t...
-#include <stdexcept>                          // for out_of_range
-#include <string>                             // for allocator, string, ope...
-#include <utility>                            // for pair
+#include <gtest/gtest.h>
+#include <gtest/gtest-message.h>   // for Message
+#include <gtest/gtest-test-part.h> // for TestPartResult, SuiteA...
+#include <gtest/gtest_pred_impl.h> // for Test, EXPECT_EQ, TestInfo
+#include <map>                     // for map, operator!=, _Rb_t...
+#include <stdexcept>               // for out_of_range
+#include <string>                  // for allocator, string, ope...
+#include <utility>                 // for pair
 
 namespace caosdb::utility {
 
diff --git a/test/test_value.cpp b/test/test_value.cpp
index 8de10b9051c5ded66f8ea3b4a23581f861a75b8d..1d959acf40c766c2123b7fdc541b642126983fcc 100644
--- a/test/test_value.cpp
+++ b/test/test_value.cpp
@@ -25,12 +25,13 @@
 #include "caosdb/protobuf_helper.h"   // for ProtoMessageWrapper
 #include <algorithm>                  // for max
 #include <cmath>                      // for isnan
-#include <gtest/gtest-message.h>      // for Message
-#include <gtest/gtest-test-part.h>    // for TestPartResult, SuiteApi...
-#include <gtest/gtest_pred_impl.h>    // for AssertionResult, Test
-#include <initializer_list>           // for initializer_list
-#include <string>                     // for string, basic_string
-#include <vector>                     // for vector
+#include <gtest/gtest.h>
+#include <gtest/gtest-message.h>   // for Message
+#include <gtest/gtest-test-part.h> // for TestPartResult, SuiteApi...
+#include <gtest/gtest_pred_impl.h> // for AssertionResult, Test
+#include <initializer_list>        // for initializer_list
+#include <string>                  // for string, basic_string
+#include <vector>                  // for vector
 
 namespace caosdb::entity {
 using ProtoValue = caosdb::entity::v1::Value;