diff --git a/test/end2end/bp_handler.cpp b/test/end2end/bp_handler.cpp
index abdf90a..2268036 100644
--- a/test/end2end/bp_handler.cpp
+++ b/test/end2end/bp_handler.cpp
@@ -1,4 +1,4 @@
-#include <attn/logging.hpp>
+#include <attn/attn_logging.hpp>
 
 namespace attn
 {
@@ -7,7 +7,7 @@
 void bpHandler()
 {
     // trace message
-    log<level::INFO>("breakpoint handler");
+    trace<level::INFO>("breakpoint handler");
 }
 
 } // namespace attn
diff --git a/test/end2end/logging.cpp b/test/end2end/logging.cpp
index ba0add7..f645947 100644
--- a/test/end2end/logging.cpp
+++ b/test/end2end/logging.cpp
@@ -1,4 +1,4 @@
-#include <attn/logging.hpp>
+#include <attn/attn_logging.hpp>
 
 #include <iostream>
 
@@ -7,9 +7,37 @@
 
 /** @brief Log message of type INFO using stdout */
 template <>
-void log<INFO>(const char* i_message)
+void trace<INFO>(const char* i_message)
 {
-    std::cout << i_message << std::endl;
+    std::cout << "trace: " << i_message << std::endl;
+}
+
+void eventCheckstop(std::map<std::string, std::string>& i_errors)
+{
+    std::string signature = i_errors.begin()->first;
+    std::string chip      = i_errors.begin()->second;
+
+    std::cout << "event: checkstop, signature = " << signature
+              << ", chip = " << chip << std::endl;
+}
+
+void eventHwDiagsFail(int i_error)
+{
+    std::cout << "event: hwdiags fail  " << i_error << std::endl;
+}
+
+void eventAttentionFail(int i_error)
+{
+    std::cout << "event: attention fail" << i_error << std::endl;
+}
+
+void eventTerminate()
+{
+    std::cout << "event: terminate" << std::endl;
+}
+void eventVital()
+{
+    std::cout << "event: vital" << std::endl;
 }
 
 } // namespace attn
diff --git a/test/end2end/meson.build b/test/end2end/meson.build
index 52eda03..98c8462 100644
--- a/test/end2end/meson.build
+++ b/test/end2end/meson.build
@@ -1,5 +1,5 @@
 # create openpower-hw-diags executable for local testing
- end2end = executable('openpower-hw-diags-test',
+end2end = executable('openpower-hw-diags-test',
             'main.cpp', 'logging.cpp', 'bp_handler.cpp', 'ti_handler.cpp',
             '../../analyzer/analyzer_main.cpp', '../../cli.cpp',
             link_with : [analyzer, attn],
@@ -7,4 +7,4 @@
             dependencies : libhei_dep,
             install : false)
 
-# test('openpower-hw-diags-test', end2end)
+#test('openpower-hw-diags-test', end2end)
diff --git a/test/end2end/ti_handler.cpp b/test/end2end/ti_handler.cpp
index 7ffb76d..021455e 100644
--- a/test/end2end/ti_handler.cpp
+++ b/test/end2end/ti_handler.cpp
@@ -1,4 +1,4 @@
-#include <attn/logging.hpp>
+#include <attn/attn_logging.hpp>
 
 namespace attn
 {
@@ -7,7 +7,7 @@
 void tiHandler()
 {
     // trace message
-    log<level::INFO>("TI handler");
+    trace<level::INFO>("TI handler");
 }
 
 } // namespace attn