diff --git a/test/caosdb_test_utility.h b/test/caosdb_test_utility.h
index 4cde3dc5059acf60a04b071154b44a59b67e9833..cd1b47ce8f61a8d8d66ae2a7d76ffce46c2a3739 100644
--- a/test/caosdb_test_utility.h
+++ b/test/caosdb_test_utility.h
@@ -32,17 +32,15 @@
  * @date 2021-07-07
  */
 #define EXPECT_THROW_MESSAGE(statement, exeption_type, message)                \
-  EXPECT_THROW(                                                                \
-      try { statement; } catch (const exeption_type &e) {                      \
-        EXPECT_EQ(std::string(e.what()), message);                             \
-        throw;                                                                 \
-      },                                                                       \
-      exeption_type)
+  EXPECT_THROW(try { statement; } catch (const exeption_type &e) {             \
+    EXPECT_EQ(std::string(e.what()), message);                                 \
+    throw;                                                                     \
+  },                                                                           \
+               exeption_type)
 #define ASSERT_THROW_MESSAGE(statement, exeption_type, message)                \
-  ASSERT_THROW(                                                                \
-      try { statement; } catch (const exeption_type &e) {                      \
-        ASSERT_EQ(std::string(e.what()), message);                             \
-        throw;                                                                 \
-      },                                                                       \
-      exeption_type)
+  ASSERT_THROW(try { statement; } catch (const exeption_type &e) {             \
+    ASSERT_EQ(std::string(e.what()), message);                                 \
+    throw;                                                                     \
+  },                                                                           \
+               exeption_type)
 #endif
diff --git a/test/test_transaction.cpp b/test/test_transaction.cpp
index e6dd5c36723d7f562ecab09ab34245ee1f5074bf..da26362490e7b5e70fea35af401ebcf2f39f2439 100644
--- a/test/test_transaction.cpp
+++ b/test/test_transaction.cpp
@@ -70,7 +70,7 @@ public:
     return values;
   }
 
-  template <typename T> static auto getValueAs(const Value &value) -> T {
+  template <typename T> static auto getValueAs(const Value & /*value*/) -> T {
     throw std::logic_error("Template not implemented for this type.");
   }
   static void DeleteEntities() {
@@ -698,7 +698,7 @@ auto test_numeric_values_impl(AtomicDataType a_type) -> void {
     Entity prop;
     prop.SetRole(Role::PROPERTY);
     const auto name =
-        std::string("Prop ") + boost::lexical_cast<std::string>(i);
+        std::string("Prop ") + std::to_string(i);
     std::cout << "Creating: " << name << std::endl;
     prop.SetName(name);
     prop.SetDataType(a_type);
@@ -721,7 +721,7 @@ auto test_numeric_values_impl(AtomicDataType a_type) -> void {
     auto retrieve_transaction(connection->CreateTransaction());
     const auto prop = props_orig[i];
     const auto name =
-        std::string("Prop ") + boost::lexical_cast<std::string>(i);
+        std::string("Prop ") + std::to_string(i);
     std::cout << "Retrieving: " << name << std::endl;
     const auto query = std::string("FIND ENTITY \"") + name + "\"";
     retrieve_transaction->Query(query);