diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 8169b723e..e127fdb06 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -9,6 +9,7 @@ set(TD_TEST_SOURCE
   ${CMAKE_CURRENT_SOURCE_DIR}/secret.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/secure_storage.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/string_cleaning.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/tdclient.cpp
 
   ${CMAKE_CURRENT_SOURCE_DIR}/data.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/data.h
diff --git a/test/mtproto.cpp b/test/mtproto.cpp
index ee33728eb..7ecce23ae 100644
--- a/test/mtproto.cpp
+++ b/test/mtproto.cpp
@@ -136,7 +136,7 @@ static int32 get_default_dc_id() {
   return 10002;
 }
 
-class Mtproto_ping : public td::Test {
+class Mtproto_ping : public Test {
  public:
   using Test::Test;
   bool step() final {
@@ -269,7 +269,7 @@ class HandshakeTestActor : public Actor {
   }
 };
 
-class Mtproto_handshake : public td::Test {
+class Mtproto_handshake : public Test {
  public:
   using Test::Test;
   bool step() final {
diff --git a/test/tdclient.cpp b/test/tdclient.cpp
index e4d7b51fc..ee79d50da 100644
--- a/test/tdclient.cpp
+++ b/test/tdclient.cpp
@@ -799,7 +799,7 @@ class LoginTestActor : public Actor {
   }
 };
 
-class Tdclient_login : public td::Test {
+class Tdclient_login : public Test {
  public:
   using Test::Test;
   bool step() final {
@@ -828,6 +828,6 @@ class Tdclient_login : public td::Test {
   ConcurrentScheduler sched_;
   Status result_;
 };
-//Tdclient_login Tdclient_login("Tdclient_login");
+//RegisterTest<Tdclient_login> Tdclient_login("Tdclient_login");
 
 }  // namespace td