diff --git a/src/modules/rtp_rtcp/source/rtcp_receiver_test.cc b/src/modules/rtp_rtcp/source/rtcp_receiver_unittest.cc
similarity index 100%
rename from src/modules/rtp_rtcp/source/rtcp_receiver_test.cc
rename to src/modules/rtp_rtcp/source/rtcp_receiver_unittest.cc
diff --git a/src/modules/rtp_rtcp/source/rtcp_sender_test.cc b/src/modules/rtp_rtcp/source/rtcp_sender_unittest.cc
similarity index 100%
rename from src/modules/rtp_rtcp/source/rtcp_sender_test.cc
rename to src/modules/rtp_rtcp/source/rtcp_sender_unittest.cc
diff --git a/src/modules/rtp_rtcp/source/rtp_header_extension_test.cc b/src/modules/rtp_rtcp/source/rtp_header_extension_unittest.cc
similarity index 100%
rename from src/modules/rtp_rtcp/source/rtp_header_extension_test.cc
rename to src/modules/rtp_rtcp/source/rtp_header_extension_unittest.cc
diff --git a/src/modules/rtp_rtcp/source/rtp_packet_history_test.cc b/src/modules/rtp_rtcp/source/rtp_packet_history_unittest.cc
similarity index 100%
rename from src/modules/rtp_rtcp/source/rtp_packet_history_test.cc
rename to src/modules/rtp_rtcp/source/rtp_packet_history_unittest.cc
diff --git a/src/modules/rtp_rtcp/source/rtp_rtcp_tests.gypi b/src/modules/rtp_rtcp/source/rtp_rtcp_tests.gypi
index f079a1595d..201d0af5b8 100644
--- a/src/modules/rtp_rtcp/source/rtp_rtcp_tests.gypi
+++ b/src/modules/rtp_rtcp/source/rtp_rtcp_tests.gypi
@@ -31,13 +31,13 @@
         'rtp_format_vp8_test_helper.cc',
         'rtp_format_vp8_test_helper.h',
         'rtcp_format_remb_unittest.cc',
-        'rtp_packet_history_test.cc',
-        'rtp_utility_test.cc',
-        'rtp_header_extension_test.cc',
-        'rtp_sender_test.cc',
-        'rtcp_sender_test.cc',
-        'rtcp_receiver_test.cc',
-        'transmission_bucket_test.cc',
+        'rtp_packet_history_unittest.cc',
+        'rtp_utility_unittest.cc',
+        'rtp_header_extension_unittest.cc',
+        'rtp_sender_unittest.cc',
+        'rtcp_sender_unittest.cc',
+        'rtcp_receiver_unittest.cc',
+        'transmission_bucket_unittest.cc',
         'vp8_partition_aggregator_unittest.cc',
       ],
     },
diff --git a/src/modules/rtp_rtcp/source/rtp_sender_test.cc b/src/modules/rtp_rtcp/source/rtp_sender_unittest.cc
similarity index 100%
rename from src/modules/rtp_rtcp/source/rtp_sender_test.cc
rename to src/modules/rtp_rtcp/source/rtp_sender_unittest.cc
diff --git a/src/modules/rtp_rtcp/source/rtp_utility_test.cc b/src/modules/rtp_rtcp/source/rtp_utility_unittest.cc
similarity index 100%
rename from src/modules/rtp_rtcp/source/rtp_utility_test.cc
rename to src/modules/rtp_rtcp/source/rtp_utility_unittest.cc
diff --git a/src/modules/rtp_rtcp/source/transmission_bucket_test.cc b/src/modules/rtp_rtcp/source/transmission_bucket_unittest.cc
similarity index 100%
rename from src/modules/rtp_rtcp/source/transmission_bucket_test.cc
rename to src/modules/rtp_rtcp/source/transmission_bucket_unittest.cc