diff --git a/wpilibcIntegrationTests/src/FRCUserProgram/cpp/AnalogPotentiometerTest.cpp b/wpilibcIntegrationTests/src/FRCUserProgram/cpp/AnalogPotentiometerTest.cpp
index bed75cd3ec..0ab50afc50 100644
--- a/wpilibcIntegrationTests/src/FRCUserProgram/cpp/AnalogPotentiometerTest.cpp
+++ b/wpilibcIntegrationTests/src/FRCUserProgram/cpp/AnalogPotentiometerTest.cpp
@@ -8,7 +8,7 @@
 #include "AnalogPotentiometer.h"  // NOLINT(build/include_order)
 
 #include "AnalogOutput.h"
-#include "ControllerPower.h"
+#include "RobotController.h"
 #include "TestBench.h"
 #include "Timer.h"
 #include "gtest/gtest.h"
@@ -43,7 +43,7 @@ TEST_F(AnalogPotentiometerTest, TestInitialSettings) {
 }
 
 TEST_F(AnalogPotentiometerTest, TestRangeValues) {
-  m_fakePot->SetVoltage(kAngle / kScale * ControllerPower::GetVoltage5V());
+  m_fakePot->SetVoltage(kAngle / kScale * RobotController::GetVoltage5V());
   Wait(0.1);
   EXPECT_NEAR(kAngle, m_pot->Get(), 2.0)
       << "The potentiometer did not measure the correct angle.";
diff --git a/wpilibcIntegrationTests/src/FRCUserProgram/cpp/DriverStationTest.cpp b/wpilibcIntegrationTests/src/FRCUserProgram/cpp/DriverStationTest.cpp
index ea0503ed6e..d9f2dfbf66 100644
--- a/wpilibcIntegrationTests/src/FRCUserProgram/cpp/DriverStationTest.cpp
+++ b/wpilibcIntegrationTests/src/FRCUserProgram/cpp/DriverStationTest.cpp
@@ -7,8 +7,8 @@
 
 #include "DriverStation.h"  // NOLINT(build/include_order)
 
+#include "RobotController.h"
 #include "TestBench.h"
-#include "Utility.h"
 #include "gtest/gtest.h"
 
 using namespace frc;
@@ -22,13 +22,13 @@ class DriverStationTest : public testing::Test {};
  * Test if the WaitForData function works
  */
 TEST_F(DriverStationTest, WaitForData) {
-  uint64_t initialTime = GetFPGATime();
+  uint64_t initialTime = RobotController::GetFPGATime();
 
   for (int i = 0; i < 50; i++) {
     DriverStation::GetInstance().WaitForData();
   }
 
-  uint64_t finalTime = GetFPGATime();
+  uint64_t finalTime = RobotController::GetFPGATime();
 
   EXPECT_NEAR(TIMER_RUNTIME, finalTime - initialTime,
               TIMER_TOLERANCE * TIMER_RUNTIME);