diff --git a/test/test_connection.cpp b/test/test_connection.cpp
index 0d648eecd823afe248d87268c3d07973fcb30c88..6ecc441fcf1598bfa057965fea2708548ff5c1a0 100644
--- a/test/test_connection.cpp
+++ b/test/test_connection.cpp
@@ -20,20 +20,25 @@
  *
  */
 
-#include "connection.h"
-#include "authentication.h"
+#include "caosdb/connection.h"
+#include "caosdb/authentication.h"
 #include <gtest/gtest-message.h>
 #include <gtest/gtest-test-part.h>
 #include <memory>
 #include "gtest/gtest_pred_impl.h"
-#include "utils.h"
+#include "caosdb/utils.h"
 
+using caosdb::connection::InsecureCaosDBConnectionConfig;
+using caosdb::connection::SslCaosDBConnectionConfig;
+using caosdb::connection::PemFileCACertProvider;
+using caosdb::connection::CaosDBConnection;
+using caosdb::authentication::PlainPasswordAuthenticator;
 using caosdb::info::v1alpha1::VersionInfo;
 
 TEST(test_connection, config_somehost_25323) {
   auto port = 25323;
   auto host = "somehost";
-  auto config = std::make_unique<caosdb::InsecureCaosDBConnectionConfig>(host, port);
+  auto config = std::make_unique<InsecureCaosDBConnectionConfig>(host, port);
 
   ASSERT_EQ(host, config->getHost());
   ASSERT_EQ(port, config->getPort());
@@ -42,8 +47,8 @@ TEST(test_connection, config_somehost_25323) {
 TEST(test_connection, connect_somehost_42347_fails) {
   auto port = 42347;
   auto host = "somehost";
-  auto config = std::make_shared<caosdb::InsecureCaosDBConnectionConfig>(host, port);
-  caosdb::CaosDBConnection connection(config);
+  auto config = std::make_shared<InsecureCaosDBConnectionConfig>(host, port);
+  CaosDBConnection connection(config);
 
   ASSERT_THROW(connection.getVersionInfo(), std::runtime_error);
 }
@@ -54,8 +59,8 @@ TEST(test_connection, connection_caosdb_server_insecure_success) {
   auto major = 0;
   auto minor = 5;
 
-  auto config = std::make_shared<caosdb::InsecureCaosDBConnectionConfig>(host, port);
-  auto connection = caosdb::CaosDBConnection(config);
+  auto config = std::make_shared<InsecureCaosDBConnectionConfig>(host, port);
+  auto connection = CaosDBConnection(config);
 
   auto v_info = connection.getVersionInfo();
   ASSERT_EQ(major, v_info.major());
@@ -69,9 +74,9 @@ TEST(test_connection, connection_caosdb_server_ssl_success) {
   auto major = 0;
   auto minor = 5;
 
-  auto ssloptions = std::make_shared<caosdb::PemFileCACertProvider>(path);
-  auto config = std::make_shared<caosdb::SslCaosDBConnectionConfig>(host, port, ssloptions);
-  auto connection = caosdb::CaosDBConnection(config);
+  auto ssloptions = std::make_shared<PemFileCACertProvider>(path);
+  auto config = std::make_shared<SslCaosDBConnectionConfig>(host, port, ssloptions);
+  auto connection = CaosDBConnection(config);
 
   auto v_info = connection.getVersionInfo();
   ASSERT_EQ(major, v_info.major());
@@ -88,10 +93,10 @@ TEST(test_connection, connection_with_authentication_success) {
   auto major = 0;
   auto minor = 5;
 
-  auto auth = std::make_shared<caosdb::authentication::PlainPasswordAuthenticator>(user, password);
-  auto ssloptions = std::make_shared<caosdb::PemFileCACertProvider>(path);
-  auto config = std::make_shared<caosdb::SslCaosDBConnectionConfig>(host, port, ssloptions, auth);
-  auto connection = caosdb::CaosDBConnection(config);
+  auto auth = std::make_shared<PlainPasswordAuthenticator>(user, password);
+  auto ssloptions = std::make_shared<PemFileCACertProvider>(path);
+  auto config = std::make_shared<SslCaosDBConnectionConfig>(host, port, ssloptions, auth);
+  auto connection = CaosDBConnection(config);
 
   auto v_info = connection.getVersionInfo();
   ASSERT_EQ(major, v_info.major());