diff --git a/romiVendordep/BUILD.bazel b/romiVendordep/BUILD.bazel
index be857334bd..d3070c58e8 100644
--- a/romiVendordep/BUILD.bazel
+++ b/romiVendordep/BUILD.bazel
@@ -78,7 +78,7 @@ cc_test(
     srcs = glob(["src/test/native/cpp/**"]),
     deps = [
         ":romiVendordep",
-        "//thirdparty/googletest",
+        "//thirdparty/catch2",
     ],
 )
 
diff --git a/romiVendordep/CMakeLists.txt b/romiVendordep/CMakeLists.txt
index 3ff756eb1b..6acf529c40 100644
--- a/romiVendordep/CMakeLists.txt
+++ b/romiVendordep/CMakeLists.txt
@@ -29,7 +29,7 @@ install(FILES ${WPILIB_BINARY_DIR}/romivendordep-config.cmake DESTINATION share/
 install(EXPORT romivendordep DESTINATION share/romiVendordep)
 
 if(WITH_TESTS)
-    wpilib_add_test(romiVendordep src/test/native/cpp)
+    wpilib_add_test_catch2(romiVendordep src/test/native/cpp)
     target_include_directories(romiVendordep_test PRIVATE src/test/native/include)
-    target_link_libraries(romiVendordep_test romiVendordep googletest)
+    target_link_libraries(romiVendordep_test romiVendordep)
 endif()
diff --git a/romiVendordep/build.gradle b/romiVendordep/build.gradle
index c93103a36a..7e16275c78 100644
--- a/romiVendordep/build.gradle
+++ b/romiVendordep/build.gradle
@@ -1,6 +1,7 @@
 ext {
     nativeName = 'romiVendordep'
     devMain = 'org.wpilib.romi.DevMain'
+    nativeTestSuiteName = "${nativeName}Catch2Test"
 }
 
 evaluationDependsOn(":ntcore")
diff --git a/romiVendordep/src/test/native/cpp/main.cpp b/romiVendordep/src/test/native/cpp/main.cpp
index a2b90c5913..38e093692f 100644
--- a/romiVendordep/src/test/native/cpp/main.cpp
+++ b/romiVendordep/src/test/native/cpp/main.cpp
@@ -2,9 +2,12 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include <gtest/gtest.h>
+#include <catch2/catch_session.hpp>
+#include <catch2/catch_test_macros.hpp>
+
+TEST_CASE("romiVendordep native test binary loads",
+          "[romi][vendordep][smoke]") {}
 
 int main(int argc, char** argv) {
-  ::testing::InitGoogleTest(&argc, argv);
-  return RUN_ALL_TESTS();
+  return Catch::Session().run(argc, argv);
 }
diff --git a/xrpVendordep/BUILD.bazel b/xrpVendordep/BUILD.bazel
index 08f3580822..589763ffc6 100644
--- a/xrpVendordep/BUILD.bazel
+++ b/xrpVendordep/BUILD.bazel
@@ -76,7 +76,7 @@ cc_test(
     srcs = glob(["src/test/native/cpp/**"]),
     deps = [
         ":xrpVendordep",
-        "//thirdparty/googletest",
+        "//thirdparty/catch2",
     ],
 )
 
diff --git a/xrpVendordep/CMakeLists.txt b/xrpVendordep/CMakeLists.txt
index 637ff01529..639f844049 100644
--- a/xrpVendordep/CMakeLists.txt
+++ b/xrpVendordep/CMakeLists.txt
@@ -29,7 +29,7 @@ install(FILES ${WPILIB_BINARY_DIR}/xrpvendordep-config.cmake DESTINATION share/x
 install(EXPORT xrpvendordep DESTINATION share/xrpVendordep)
 
 if(WITH_TESTS)
-    wpilib_add_test(xrpVendordep src/test/native/cpp)
+    wpilib_add_test_catch2(xrpVendordep src/test/native/cpp)
     target_include_directories(xrpVendordep_test PRIVATE src/test/native/include)
-    target_link_libraries(xrpVendordep_test xrpVendordep googletest)
+    target_link_libraries(xrpVendordep_test xrpVendordep)
 endif()
diff --git a/xrpVendordep/build.gradle b/xrpVendordep/build.gradle
index e0af934544..2972edddfc 100644
--- a/xrpVendordep/build.gradle
+++ b/xrpVendordep/build.gradle
@@ -1,6 +1,7 @@
 ext {
     nativeName = 'xrpVendordep'
     devMain = 'org.wpilib.xrp.DevMain'
+    nativeTestSuiteName = "${nativeName}Catch2Test"
 }
 
 evaluationDependsOn(":ntcore")
diff --git a/xrpVendordep/src/test/native/cpp/main.cpp b/xrpVendordep/src/test/native/cpp/main.cpp
index a2b90c5913..0017853109 100644
--- a/xrpVendordep/src/test/native/cpp/main.cpp
+++ b/xrpVendordep/src/test/native/cpp/main.cpp
@@ -2,9 +2,11 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include <gtest/gtest.h>
+#include <catch2/catch_session.hpp>
+#include <catch2/catch_test_macros.hpp>
+
+TEST_CASE("xrpVendordep native test binary loads", "[xrp][vendordep][smoke]") {}
 
 int main(int argc, char** argv) {
-  ::testing::InitGoogleTest(&argc, argv);
-  return RUN_ALL_TESTS();
+  return Catch::Session().run(argc, argv);
 }