diff --git a/tests/rib/fib-updates-erase-face.cpp b/tests/rib/fib-updates-erase-face.t.cpp
similarity index 99%
rename from tests/rib/fib-updates-erase-face.cpp
rename to tests/rib/fib-updates-erase-face.t.cpp
index a037b44..39e313d 100644
--- a/tests/rib/fib-updates-erase-face.cpp
+++ b/tests/rib/fib-updates-erase-face.t.cpp
@@ -32,7 +32,7 @@
 namespace rib {
 namespace tests {
 
-BOOST_FIXTURE_TEST_SUITE(FibUpdates, FibUpdatesFixture)
+BOOST_FIXTURE_TEST_SUITE(TestFibUpdates, FibUpdatesFixture)
 
 BOOST_AUTO_TEST_SUITE(EraseFace)
 
diff --git a/tests/rib/fib-updates-new-face.cpp b/tests/rib/fib-updates-new-face.t.cpp
similarity index 98%
rename from tests/rib/fib-updates-new-face.cpp
rename to tests/rib/fib-updates-new-face.t.cpp
index e5128d8..850e8ae 100644
--- a/tests/rib/fib-updates-new-face.cpp
+++ b/tests/rib/fib-updates-new-face.t.cpp
@@ -32,7 +32,7 @@
 namespace rib {
 namespace tests {
 
-BOOST_FIXTURE_TEST_SUITE(FibUpdates, FibUpdatesFixture)
+BOOST_FIXTURE_TEST_SUITE(TestFibUpdates, FibUpdatesFixture)
 
 BOOST_AUTO_TEST_SUITE(NewFace)
 
diff --git a/tests/rib/fib-updates-new-namespace.cpp b/tests/rib/fib-updates-new-namespace.t.cpp
similarity index 98%
rename from tests/rib/fib-updates-new-namespace.cpp
rename to tests/rib/fib-updates-new-namespace.t.cpp
index f44d286..e42271f 100644
--- a/tests/rib/fib-updates-new-namespace.cpp
+++ b/tests/rib/fib-updates-new-namespace.t.cpp
@@ -32,7 +32,7 @@
 namespace rib {
 namespace tests {
 
-BOOST_FIXTURE_TEST_SUITE(FibUpdates, FibUpdatesFixture)
+BOOST_FIXTURE_TEST_SUITE(TestFibUpdates, FibUpdatesFixture)
 
 BOOST_AUTO_TEST_SUITE(NewNamespace)
 
diff --git a/tests/rib/fib-updates-update-face.cpp b/tests/rib/fib-updates-update-face.t.cpp
similarity index 98%
rename from tests/rib/fib-updates-update-face.cpp
rename to tests/rib/fib-updates-update-face.t.cpp
index 2850cc3..af49188 100644
--- a/tests/rib/fib-updates-update-face.cpp
+++ b/tests/rib/fib-updates-update-face.t.cpp
@@ -32,7 +32,7 @@
 namespace rib {
 namespace tests {
 
-BOOST_FIXTURE_TEST_SUITE(FibUpdates, FibUpdatesFixture)
+BOOST_FIXTURE_TEST_SUITE(TestFibUpdates, FibUpdatesFixture)
 
 BOOST_AUTO_TEST_SUITE(UpdateFace)
 
diff --git a/tests/rib/remote-registrator.cpp b/tests/rib/remote-registrator.t.cpp
similarity index 99%
rename from tests/rib/remote-registrator.cpp
rename to tests/rib/remote-registrator.t.cpp
index 9caf345..5c81f88 100644
--- a/tests/rib/remote-registrator.cpp
+++ b/tests/rib/remote-registrator.t.cpp
@@ -204,7 +204,7 @@
 
 const name::Component RemoteRegistratorFixture::DEFAULT_APP_NAME("app");
 
-BOOST_FIXTURE_TEST_SUITE(RemoteRegistrator, RemoteRegistratorFixture)
+BOOST_FIXTURE_TEST_SUITE(TestRemoteRegistrator, RemoteRegistratorFixture)
 
 BOOST_FIXTURE_TEST_CASE(AutoTest, RemoteRegistratorFixture)
 {
diff --git a/tests/rib/rib-manager.cpp b/tests/rib/rib-manager.t.cpp
similarity index 99%
rename from tests/rib/rib-manager.cpp
rename to tests/rib/rib-manager.t.cpp
index 1d21bdb..9b31996 100644
--- a/tests/rib/rib-manager.cpp
+++ b/tests/rib/rib-manager.t.cpp
@@ -117,7 +117,7 @@
 
 typedef RibManagerFixture UnauthorizedRibManager;
 
-BOOST_FIXTURE_TEST_SUITE(RibManager, RibManagerFixture)
+BOOST_FIXTURE_TEST_SUITE(TestRibManager, RibManagerFixture)
 
 BOOST_FIXTURE_TEST_CASE(ShortName, AuthorizedRibManager)
 {
diff --git a/tests/rib/rib-status-publisher.cpp b/tests/rib/rib-status-publisher.t.cpp
similarity index 96%
rename from tests/rib/rib-status-publisher.cpp
rename to tests/rib/rib-status-publisher.t.cpp
index 59e3fe7..55ba64f 100644
--- a/tests/rib/rib-status-publisher.cpp
+++ b/tests/rib/rib-status-publisher.t.cpp
@@ -33,7 +33,7 @@
 namespace rib {
 namespace tests {
 
-BOOST_FIXTURE_TEST_SUITE(RibStatusPublisherSuite, RibStatusPublisherFixture)
+BOOST_FIXTURE_TEST_SUITE(TestRibStatusPublisher, RibStatusPublisherFixture)
 
 BOOST_AUTO_TEST_CASE(Basic)
 {
diff --git a/tests/rib/rib.cpp b/tests/rib/rib.t.cpp
similarity index 99%
rename from tests/rib/rib.cpp
rename to tests/rib/rib.t.cpp
index a88dc2b..12b6208 100644
--- a/tests/rib/rib.cpp
+++ b/tests/rib/rib.t.cpp
@@ -31,7 +31,7 @@
 namespace rib {
 namespace tests {
 
-BOOST_FIXTURE_TEST_SUITE(Rib, nfd::tests::BaseFixture)
+BOOST_FIXTURE_TEST_SUITE(TestRib, nfd::tests::BaseFixture)
 
 BOOST_AUTO_TEST_CASE(RibEntry)
 {