diff --git a/tests/ir-tests.cpp b/tests/ir-tests.cpp
index d255353..a43aced 100644
--- a/tests/ir-tests.cpp
+++ b/tests/ir-tests.cpp
@@ -488,7 +488,7 @@
 }
 
 //Entrypoint for the testing program.
-int main()
+int main(int argc, char **argv)
 {
 	if (GEN_EXAMPLES) {
 		cper_create_examples("arm");
@@ -508,6 +508,6 @@
 		cper_create_examples("nvidia");
 		cper_create_examples("unknown");
 	}
-	testing::InitGoogleTest();
+	testing::InitGoogleTest(&argc, argv);
 	return RUN_ALL_TESTS();
 }
diff --git a/tests/meson.build b/tests/meson.build
index f65dc41..ca21b42 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -1,6 +1,6 @@
 cmake = import('cmake')
 
-gtest = dependency('gtest', main: true, disabler: true, required: false)
+gtest = dependency('gtest', disabler: true, required: false)
 gmock = dependency('gmock', disabler: true, required: false)
 if not gtest.found() or not gmock.found()
     gtest_proj = import('cmake').subproject('googletest', required: false)
diff --git a/tests/test-utils.cpp b/tests/test-utils.cpp
index ca885fc..11d8a02 100644
--- a/tests/test-utils.cpp
+++ b/tests/test-utils.cpp
@@ -30,6 +30,13 @@
 		    "timedOut", "level", "operation", "preciseIP",
 		    "restartableIP", "overflow", "uncorrected",
 		    "transactionType" } },
+		// Several PCIe properties are dependent on the device capability
+		// version and whether the device is running in Flit-Mode.
+		// All of these properties are optional.
+		{ "./sections/cper-pcie.json",
+		  { "device_capabilities2", "device_status2", "device_control2",
+		    "link_capabilities2", "link_status2", "link_control2",
+		    "slot_capabilities2", "slot_status2", "slot_control2" } },
 	};
 
 nlohmann::json loadJson(const char *filePath)