diff --git a/src/test/unittests/base/XBaseTests.cpp b/src/test/unittests/base/XBaseTests.cpp
deleted file mode 100644
index 258117a12..000000000
--- a/src/test/unittests/base/XBaseTests.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Deskflow -- mouse and keyboard sharing utility
- * SPDX-FileCopyrightText: (C) 2014 - 2024 Symless Ltd.
- * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
- */
-
-#include "base/XBase.h"
-
-#include <gtest/gtest.h>
-
-TEST(XBaseTests, what_emptyWhat_returnsWhatFromGetWhat)
-{
-  XBase xbase;
-
-  const char *result = xbase.what();
-
-  EXPECT_STREQ("", result);
-}
-
-TEST(XBaseTests, what_nonEmptyWhat_returnsWhatFromGetWhat)
-{
-  XBase xbase("test");
-
-  const char *result = xbase.what();
-
-  EXPECT_STREQ("test", result);
-}
diff --git a/src/unittests/base/CMakeLists.txt b/src/unittests/base/CMakeLists.txt
index cc9cd01cd..95671439a 100644
--- a/src/unittests/base/CMakeLists.txt
+++ b/src/unittests/base/CMakeLists.txt
@@ -28,3 +28,12 @@ create_test(
   SOURCE UnicodeTests.cpp
   WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/src/lib/base"
 )
+
+create_test(
+  NAME XBaseTests
+  DEPENDS base
+  LIBS arch
+  SOURCE XBaseTests.cpp
+  WORKING_DIRECTORY "${CMAKE_BINARY_DIR}/src/lib/base"
+)
+
diff --git a/src/unittests/base/XBaseTests.cpp b/src/unittests/base/XBaseTests.cpp
new file mode 100644
index 000000000..1bc7da6a7
--- /dev/null
+++ b/src/unittests/base/XBaseTests.cpp
@@ -0,0 +1,28 @@
+/*
+ * Deskflow -- mouse and keyboard sharing utility
+ * SPDX-FileCopyrightText: (C) 2025 Chris Rizzitello <sithlord48@gmail.com>
+ * SPDX-FileCopyrightText: (C) 2014 - 2021 Symless Ltd.
+ * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
+ */
+
+#include "XBaseTests.h"
+
+#include "../../lib/base/XBase.h"
+
+void XBaseTests::empty()
+{
+  XBase xbase;
+  const char *result = xbase.what();
+
+  QCOMPARE(result, "");
+}
+
+void XBaseTests::nonEmpty()
+{
+  XBase xbase("test");
+  const char *result = xbase.what();
+
+  QCOMPARE(result, "test");
+}
+
+QTEST_MAIN(XBaseTests)
diff --git a/src/unittests/base/XBaseTests.h b/src/unittests/base/XBaseTests.h
new file mode 100644
index 000000000..f301677dd
--- /dev/null
+++ b/src/unittests/base/XBaseTests.h
@@ -0,0 +1,15 @@
+/*
+ * Deskflow -- mouse and keyboard sharing utility
+ * SPDX-FileCopyrightText: (C) 2025 Chris Rizzitello <sithlord48@gmail.com>
+ * SPDX-License-Identifier: GPL-2.0-only WITH LicenseRef-OpenSSL-Exception
+ */
+
+#include <QTest>
+
+class XBaseTests : public QObject
+{
+  Q_OBJECT
+private slots:
+  void empty();
+  void nonEmpty();
+};