diff --git a/test/kiwixserve.cpp b/test/kiwixserve.cpp
new file mode 100644
index 000000000..722a0c8b7
--- /dev/null
+++ b/test/kiwixserve.cpp
@@ -0,0 +1,18 @@
+#include "gtest/gtest.h"
+#include "../include/kiwixserve.h"
+
+TEST(KiwixServeTest, PortTest)
+{
+    kiwix::KiwixServe kiwixServe("libraryPath", 8181);
+    EXPECT_EQ(kiwixServe.getPort(), 8181);
+    kiwixServe.setPort(8484);
+    EXPECT_EQ(kiwixServe.getPort(), 8484);
+    EXPECT_EQ(kiwixServe.setPort(0), -1);
+    EXPECT_EQ(kiwixServe.setPort(3456789), -1);    
+}
+
+int main(int argc, char** argv)
+{
+  ::testing::InitGoogleTest(&argc, argv);
+  return RUN_ALL_TESTS();
+}
\ No newline at end of file
diff --git a/test/meson.build b/test/meson.build
index 360c66d93..2a0bf621e 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -6,7 +6,8 @@ tests = [
     'regex',
     'tagParsing',
     'stringTools',
-    'pathTools'
+    'pathTools',
+    'kiwixserve'
 ]