diff --git a/src/tests/unit-tests/control-plane/control_thread_test.cc b/src/tests/unit-tests/control-plane/control_thread_test.cc
index bc9e71009..686c2dc15 100644
--- a/src/tests/unit-tests/control-plane/control_thread_test.cc
+++ b/src/tests/unit-tests/control-plane/control_thread_test.cc
@@ -112,7 +112,7 @@ TEST_F(ControlThreadTest, InstantiateRunControlMessages)
     config->set_property("TelemetryDecoder_1C.item_type", "gr_complex");
     config->set_property("Observables.implementation", "Hybrid_Observables");
     config->set_property("Observables.item_type", "gr_complex");
-    config->set_property("PVT.implementation", "Hybrid_PVT");
+    config->set_property("PVT.implementation", "RTKLIB_PVT");
     config->set_property("PVT.item_type", "gr_complex");
 
     std::shared_ptr<ControlThread> control_thread = std::make_shared<ControlThread>(config);
@@ -172,7 +172,7 @@ TEST_F(ControlThreadTest, InstantiateRunControlMessages2)
     config->set_property("TelemetryDecoder_1C.item_type", "gr_complex");
     config->set_property("Observables.implementation", "Hybrid_Observables");
     config->set_property("Observables.item_type", "gr_complex");
-    config->set_property("PVT.implementation", "Hybrid_PVT");
+    config->set_property("PVT.implementation", "RTKLIB_PVT");
     config->set_property("PVT.item_type", "gr_complex");
 
     std::unique_ptr<ControlThread> control_thread2(new ControlThread(config));
@@ -236,7 +236,7 @@ TEST_F(ControlThreadTest, StopReceiverProgrammatically)
     config->set_property("TelemetryDecoder_1C.item_type", "gr_complex");
     config->set_property("Observables.implementation", "Hybrid_Observables");
     config->set_property("Observables.item_type", "gr_complex");
-    config->set_property("PVT.implementation", "Hybrid_PVT");
+    config->set_property("PVT.implementation", "RTKLIB_PVT");
     config->set_property("PVT.item_type", "gr_complex");
 
     std::shared_ptr<ControlThread> control_thread = std::make_shared<ControlThread>(config);
diff --git a/src/tests/unit-tests/control-plane/gnss_flowgraph_test.cc b/src/tests/unit-tests/control-plane/gnss_flowgraph_test.cc
index 1dd59576e..8c31aaca2 100644
--- a/src/tests/unit-tests/control-plane/gnss_flowgraph_test.cc
+++ b/src/tests/unit-tests/control-plane/gnss_flowgraph_test.cc
@@ -65,7 +65,7 @@ TEST(GNSSFlowgraph, InstantiateConnectStartStopOldNotation)
     config->set_property("Tracking_1C.implementation", "GPS_L1_CA_DLL_PLL_Tracking");
     config->set_property("TelemetryDecoder_1C.implementation", "GPS_L1_CA_Telemetry_Decoder");
     config->set_property("Observables.implementation", "Hybrid_Observables");
-    config->set_property("PVT.implementation", "Hybrid_PVT");
+    config->set_property("PVT.implementation", "RTKLIB_PVT");
 
     std::shared_ptr<GNSSFlowgraph> flowgraph = std::make_shared<GNSSFlowgraph>(config, gr::msg_queue::make(0));
 
@@ -100,7 +100,7 @@ TEST(GNSSFlowgraph, InstantiateConnectStartStop)
     config->set_property("Tracking_1C.implementation", "GPS_L1_CA_DLL_PLL_Tracking");
     config->set_property("TelemetryDecoder_1C.implementation", "GPS_L1_CA_Telemetry_Decoder");
     config->set_property("Observables.implementation", "Hybrid_Observables");
-    config->set_property("PVT.implementation", "Hybrid_PVT");
+    config->set_property("PVT.implementation", "RTKLIB_PVT");
 
     std::shared_ptr<GNSSFlowgraph> flowgraph = std::make_shared<GNSSFlowgraph>(config, gr::msg_queue::make(0));
 
@@ -134,7 +134,7 @@ TEST(GNSSFlowgraph, InstantiateConnectStartStopGalileoE1B)
     config->set_property("Tracking_1B.implementation", "Galileo_E1_DLL_PLL_VEML_Tracking");
     config->set_property("TelemetryDecoder_1B.implementation", "Galileo_E1B_Telemetry_Decoder");
     config->set_property("Observables.implementation", "Hybrid_Observables");
-    config->set_property("PVT.implementation", "Hybrid_PVT");
+    config->set_property("PVT.implementation", "RTKLIB_PVT");
 
     std::shared_ptr<GNSSFlowgraph> flowgraph = std::make_shared<GNSSFlowgraph>(config, gr::msg_queue::make(0));
 
@@ -266,7 +266,7 @@ TEST(GNSSFlowgraph, InstantiateConnectStartStopHybrid)
     config->set_property("TelemetryDecoder_1B15.decimation_factor", "1");
 
     config->set_property("Observables.implementation", "Hybrid_Observables");
-    config->set_property("PVT.implementation", "Hybrid_PVT");
+    config->set_property("PVT.implementation", "RTKLIB_PVT");
 
     std::shared_ptr<GNSSFlowgraph> flowgraph = std::make_shared<GNSSFlowgraph>(config, gr::msg_queue::make(0));