diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 4572121b..029a9bb3 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -4,6 +4,7 @@ add_executable(p4-fusion-test
     ../p4-fusion/utils/std_helpers.cc
     ../p4-fusion/utils/time_helpers.cc
     ../p4-fusion/git_api.cc
+    ../p4-fusion/p4_api.cc
 )
 
 target_include_directories(p4-fusion-test PRIVATE
diff --git a/tests/main.cc b/tests/main.cc
index 9d7e8d3e..88bc9591 100644
--- a/tests/main.cc
+++ b/tests/main.cc
@@ -6,14 +6,16 @@
  */
 #include <iostream>
 
-#include "tests.common.h"
-#include "tests.utils.h"
-#include "tests.git.h"
+#include "test.common.h"
+#include "test.utils.h"
+#include "test.git.h"
+#include "test.perforce.h"
 
 int main()
 {
 	TEST_REPORT("Utils", TestUtils());
 	TEST_REPORT("GitAPI", TestGitAPI());
+	TEST_REPORT("P4API", TestP4API());
 
 	SUCCESS("All test cases passed");
 	return 0;
diff --git a/tests/tests.common.h b/tests/test.common.h
similarity index 100%
rename from tests/tests.common.h
rename to tests/test.common.h
diff --git a/tests/tests.git.h b/tests/test.git.h
similarity index 98%
rename from tests/tests.git.h
rename to tests/test.git.h
index 1399165c..2827a90e 100644
--- a/tests/tests.git.h
+++ b/tests/test.git.h
@@ -6,7 +6,7 @@
  */
 #pragma once
 
-#include "tests.common.h"
+#include "test.common.h"
 #include "git_api.h"
 
 int TestGitAPI()
diff --git a/tests/test.perforce.h b/tests/test.perforce.h
new file mode 100644
index 00000000..5e9a4545
--- /dev/null
+++ b/tests/test.perforce.h
@@ -0,0 +1,19 @@
+/*
+ * Copyright (c) 2022 Salesforce, Inc.
+ * All rights reserved.
+ * SPDX-License-Identifier: BSD-3-Clause
+ * For full license text, see the LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
+ */
+#pragma once
+
+#include "test.common.h"
+
+int TestP4API()
+{
+	TEST_START();
+
+	// ServerHelperApi
+
+	TEST_END();
+	return TEST_EXIT_CODE();
+}
diff --git a/tests/tests.utils.h b/tests/test.utils.h
similarity index 99%
rename from tests/tests.utils.h
rename to tests/test.utils.h
index 9a0a00a8..3a4ee0e4 100644
--- a/tests/tests.utils.h
+++ b/tests/test.utils.h
@@ -6,7 +6,7 @@
  */
 #pragma once
 
-#include "tests.common.h"
+#include "test.common.h"
 #include "utils/std_helpers.h"
 #include "utils/time_helpers.h"