diff --git a/test/end2end/meson.build b/test/end2end/meson.build
deleted file mode 100644
index adb8eeb..0000000
--- a/test/end2end/meson.build
+++ /dev/null
@@ -1,19 +0,0 @@
-# Source files specific to end2end test.
-end2end_src = [
-    'main.cpp',
-]
-
-# Additional source files needed for test.
-additional_src = [
-    '../../cli.cpp',
-]
-
-# create openpower-hw-diags executable for local testing
-end2end = executable('test-openpower-hw-diags',
-            end2end_src, additional_src,
-            link_with : hwdiags_libs,
-            include_directories : incdir,
-            cpp_args : test_arg,
-            install : false)
-
-test('test-openpower-hw-diags', end2end)
diff --git a/test/meson.build b/test/meson.build
index b953857..ed7ef5c 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -41,9 +41,6 @@
 
 pdbg_env = 'PDBG_DTB=' + pdbg_test_dtb.full_path()
 
-# end2end code exerciser for experiment and testing
-subdir('end2end')
-
 ################################################################################
 
 tc = 'test-bin-stream'
@@ -270,3 +267,26 @@
                  cpp_args: test_arg, include_directories: incdir)
 
 test(tc, exe, env: var)
+
+################################################################################
+
+tc = 'test-end2end'
+
+src = [
+  files(
+    tc + '.cpp',
+    '../cli.cpp',
+  ),
+  pdbg_test_dtb,
+]
+
+dep = [ gtest_dep ]
+
+var = [ pdbg_env ]
+
+exe = executable(tc.underscorify(), src, dependencies: dep,
+                 link_with : hwdiags_libs,
+                 cpp_args: test_arg, include_directories: incdir)
+
+test(tc, exe, env: var)
+
diff --git a/test/end2end/main.cpp b/test/test-end2end.cpp
similarity index 100%
rename from test/end2end/main.cpp
rename to test/test-end2end.cpp