diff --git a/inc/ActionRouter.php b/inc/ActionRouter.php
index 2c9832d26b8b3aea02f88077429d22fcc760aaf9..79de9deedd28af3a9ad146a430fe649be62cf769 100644
--- a/inc/ActionRouter.php
+++ b/inc/ActionRouter.php
@@ -19,7 +19,7 @@ class ActionRouter {
     protected $action;
 
     /** @var  ActionRouter */
-    protected static $instance = NULL;
+    protected static $instance = null;
 
     /** @var int transition counter */
     protected $transitions = 0;
@@ -44,14 +44,9 @@ class ActionRouter {
         $this->disabled = array_map('trim', $this->disabled);
         $this->transitions = 0;
 
-        if(defined('DOKU_UNITTEST') && (self::$instance !== null)) {
-            $ACT = act_clean($ACT);
-            $this->setupAction($ACT);
-        } else {
-            $ACT = act_clean($ACT);
-            $this->setupAction($ACT);
-            $ACT = $this->action->getActionName();
-        }
+        $ACT = act_clean($ACT);
+        $this->setupAction($ACT);
+        $ACT = $this->action->getActionName();
     }
 
     /**
diff --git a/inc/actions.php b/inc/actions.php
index e31ef3c2eefb43ad80b1b7620792766b5324d52c..9ba8878603ae9924102d902f46cf146866f84d03 100644
--- a/inc/actions.php
+++ b/inc/actions.php
@@ -8,14 +8,12 @@
 
 if(!defined('DOKU_INC')) die('meh.');
 
-
+/**
+ * All action processing starts here
+ */
 function act_dispatch(){
-    $reinit = false;
-    if(defined('DOKU_UNITTEST')) {
-        // For integration test running multiple requests we need a re-init here!
-        $reinit = true;
-    }
-    $router = \dokuwiki\ActionRouter::getInstance($reinit); // is this needed here or could we delegate it to tpl_content() later?
+    // always initialize on first dispatch (test request may dispatch mutliple times on one request)
+    $router = \dokuwiki\ActionRouter::getInstance(true);
 
     $headers = array('Content-Type: text/html; charset=utf-8');
     trigger_event('ACTION_HEADERS_SEND',$headers,'act_sendheaders');