diff --git a/.gitlab/Fedora-Linux-CI.yml b/.gitlab/Fedora-Linux-CI.yml
index 10f068e397..28e6ccadfa 100644
--- a/.gitlab/Fedora-Linux-CI.yml
+++ b/.gitlab/Fedora-Linux-CI.yml
@@ -32,6 +32,7 @@ fedora_build_linux:
       -DKICAD_USE_OCC=ON
       -DKICAD_SPICE=ON
       -DKICAD_BUILD_I18N=ON
+      -DKICAD_BUILD_PNS_DEBUG_TOOL=ON
       ../../
     - make 2>&1 | tee compilation_log.txt
     - cd ../../
diff --git a/.gitlab/Ubuntu-20.04-CI.yml b/.gitlab/Ubuntu-20.04-CI.yml
index 8d22eac47c..c53d3c8c4c 100644
--- a/.gitlab/Ubuntu-20.04-CI.yml
+++ b/.gitlab/Ubuntu-20.04-CI.yml
@@ -40,6 +40,7 @@ ubuntu20.04_build:
       -DKICAD_USE_OCC=ON
       -DKICAD_SPICE=ON
       -DKICAD_BUILD_I18N=ON
+      -DKICAD_BUILD_PNS_DEBUG_TOOL=ON
       ../../
     - ninja 2>&1 | tee compilation_log.txt
     - cd ../../
diff --git a/.gitlab/Windows-CI.yml b/.gitlab/Windows-CI.yml
index 9d27fdb403..fe626c51a1 100644
--- a/.gitlab/Windows-CI.yml
+++ b/.gitlab/Windows-CI.yml
@@ -27,6 +27,7 @@ win64_build:
       -DKICAD_USE_OCE=OFF `
       -DKICAD_USE_OCC=ON `
       -DKICAD_SPICE=ON `
+      -DKICAD_BUILD_PNS_DEBUG_TOOL=ON `
       ../../
     - cmake --build . 2>&1 | tee compilation_log.txt
     - cd ../../
diff --git a/qa/pns/CMakeLists.txt b/qa/pns/CMakeLists.txt
index 1cb6cee46f..2a9305430c 100644
--- a/qa/pns/CMakeLists.txt
+++ b/qa/pns/CMakeLists.txt
@@ -25,7 +25,7 @@
 find_package(Boost COMPONENTS unit_test_framework REQUIRED)
 find_package( wxWidgets 3.0.0 COMPONENTS gl aui adv html core net base xml stc REQUIRED )
 
-add_definitions(-DBOOST_TEST_DYN_LINK -DPCBNEW)
+add_definitions(-DBOOST_TEST_DYN_LINK -DPCBNEW -DTEST_APP_GUI)
 
 
 add_executable( test_pns
diff --git a/qa/pns/logviewer.fbp b/qa/pns/logviewer.fbp
index b22602bf8c..62912b58eb 100644
--- a/qa/pns/logviewer.fbp
+++ b/qa/pns/logviewer.fbp
@@ -14,7 +14,6 @@
         <property name="file">pns_log_viewer_frame_base</property>
         <property name="first_id">1000</property>
         <property name="help_provider">none</property>
-        <property name="image_path_wrapper_function_name"></property>
         <property name="indent_with_spaces"></property>
         <property name="internationalize">0</property>
         <property name="name">PNS_LOG_VIEWER</property>
@@ -26,7 +25,6 @@
         <property name="skip_php_events">1</property>
         <property name="skip_python_events">1</property>
         <property name="ui_table">UI</property>
-        <property name="use_array_enum">0</property>
         <property name="use_enum">0</property>
         <property name="use_microsoft_bom">0</property>
         <object class="Frame" expanded="1">
@@ -65,6 +63,7 @@
                 <property name="font"></property>
                 <property name="hidden">0</property>
                 <property name="id">wxID_ANY</property>
+                <property name="label">MyMenuBar</property>
                 <property name="maximum_size"></property>
                 <property name="minimum_size"></property>
                 <property name="name">m_menubar1</property>
@@ -77,7 +76,7 @@
                 <property name="window_extra_style"></property>
                 <property name="window_name"></property>
                 <property name="window_style"></property>
-                <object class="wxMenu" expanded="0">
+                <object class="wxMenu" expanded="1">
                     <property name="label">File</property>
                     <property name="name">m_menu1</property>
                     <property name="permission">protected</property>
@@ -206,7 +205,6 @@
                                 <property name="aui_name"></property>
                                 <property name="aui_position"></property>
                                 <property name="aui_row"></property>
-                                <property name="auth_needed">0</property>
                                 <property name="best_size"></property>
                                 <property name="bg"></property>
                                 <property name="bitmap"></property>
@@ -346,7 +344,6 @@
                                 <property name="aui_name"></property>
                                 <property name="aui_position"></property>
                                 <property name="aui_row"></property>
-                                <property name="auth_needed">0</property>
                                 <property name="best_size"></property>
                                 <property name="bg"></property>
                                 <property name="bitmap"></property>
@@ -457,7 +454,7 @@
                                 <property name="resize">Resizable</property>
                                 <property name="show">1</property>
                                 <property name="size"></property>
-                                <property name="style"></property>
+                                <property name="style">wxTE_PROCESS_ENTER</property>
                                 <property name="subclass">; ; forward_declare</property>
                                 <property name="toolbar_pane">0</property>
                                 <property name="tooltip"></property>
diff --git a/qa/pns/pns_log_viewer_frame_base.cpp b/qa/pns/pns_log_viewer_frame_base.cpp
index 7c1e077291..a99a844e73 100644
--- a/qa/pns/pns_log_viewer_frame_base.cpp
+++ b/qa/pns/pns_log_viewer_frame_base.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version 3.9.0 Feb  6 2021)
+// C++ code generated with wxFormBuilder (version Oct 26 2018)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
@@ -53,7 +53,7 @@ PNS_LOG_VIEWER_FRAME_BASE::PNS_LOG_VIEWER_FRAME_BASE( wxWindow* parent, wxWindow
 
 	fgSizer3->Add( m_rewindRight, 1, wxALL, 5 );
 
-	m_rewindPos = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
+	m_rewindPos = new wxTextCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxTE_PROCESS_ENTER );
 	fgSizer3->Add( m_rewindPos, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 );
 
 
diff --git a/qa/pns/pns_log_viewer_frame_base.h b/qa/pns/pns_log_viewer_frame_base.h
index 68c7b077e3..780665cc7e 100644
--- a/qa/pns/pns_log_viewer_frame_base.h
+++ b/qa/pns/pns_log_viewer_frame_base.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version 3.9.0 Feb  6 2021)
+// C++ code generated with wxFormBuilder (version Oct 26 2018)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
@@ -50,7 +50,7 @@ class PNS_LOG_VIEWER_FRAME_BASE : public wxFrame
 		wxTreeListCtrl* m_itemList;
 		wxStatusBar* m_statusBar;
 
-		// Virtual event handlers, override them in your derived class
+		// Virtual event handlers, overide them in your derived class
 		virtual void onReload( wxCommandEvent& event ) { event.Skip(); }
 		virtual void onExit( wxCommandEvent& event ) { event.Skip(); }
 		virtual void onBtnRewindLeft( wxCommandEvent& event ) { event.Skip(); }
diff --git a/qa/qa_utils/test_app_main.cpp b/qa/qa_utils/test_app_main.cpp
index c1054cd4a0..58b48f7014 100644
--- a/qa/qa_utils/test_app_main.cpp
+++ b/qa/qa_utils/test_app_main.cpp
@@ -254,7 +254,11 @@ int main( int argc, char** argv )
 {
     wxInitialize( argc, argv );
 
+#ifdef TEST_APP_GUI
+    Pgm().InitPgm( false );
+#else
     Pgm().InitPgm( true );
+#endif
 
     auto ret = wxEntry( argc, argv );