diff --git a/tests/benchmarks/encoding-bench.cpp b/tests/benchmarks/encoding.cpp
similarity index 100%
rename from tests/benchmarks/encoding-bench.cpp
rename to tests/benchmarks/encoding.cpp
diff --git a/tests/benchmarks/scheduler-bench.cpp b/tests/benchmarks/scheduler.cpp
similarity index 100%
rename from tests/benchmarks/scheduler-bench.cpp
rename to tests/benchmarks/scheduler.cpp
diff --git a/tests/benchmarks/wscript b/tests/benchmarks/wscript
index 3c1e532..87a3f53 100644
--- a/tests/benchmarks/wscript
+++ b/tests/benchmarks/wscript
@@ -3,10 +3,11 @@
 top = '../..'
 
 def build(bld):
-    for test in bld.path.ant_glob('*.cpp'):
-        name = test.change_ext('').path_from(bld.path.get_bld())
-        bld.program(name=f'test-{name}',
-                    target=name,
-                    source=[test],
-                    use='BOOST_TESTS ndn-cxx',
-                    install_path=None)
+    for file in bld.path.ant_glob('*.cpp'):
+        name = file.change_ext('').path_from(bld.path.get_bld())
+        bld.program(
+            name=f'bench-{name}',
+            target=name,
+            source=[file],
+            use='BOOST_TESTS ndn-cxx',
+            install_path=None)
diff --git a/tests/integration/wscript b/tests/integration/wscript
index 02ca4f0..a38c111 100644
--- a/tests/integration/wscript
+++ b/tests/integration/wscript
@@ -3,10 +3,11 @@
 top = '../..'
 
 def build(bld):
-    for test in bld.path.ant_glob('*.cpp'):
-        name = test.change_ext('').path_from(bld.path.get_bld())
-        bld.program(name=f'test-{name}',
-                    target=name,
-                    source=[test],
-                    use='tests-common',
-                    install_path=None)
+    for file in bld.path.ant_glob('*.cpp'):
+        name = file.change_ext('').path_from(bld.path.get_bld())
+        bld.program(
+            name=f'integ-test-{name}',
+            target=name,
+            source=[file],
+            use='tests-common',
+            install_path=None)