diff --git a/inc/load.php b/inc/load.php
index 8bb54cd536cacf23fa0d60dac1d764fc06349b6c..68bf69cf311184150db78c43f874c3a9ccf58ef8 100644
--- a/inc/load.php
+++ b/inc/load.php
@@ -121,6 +121,16 @@ function load_autoload($name){
         }
     }
 
+    // template namespace
+    if(substr($name, 0, 18) == 'dokuwiki/template/') {
+        $name = str_replace('/test/', '/_test/', $name); // no underscore in test namespace
+        $file = DOKU_INC.'lib/tpl/' . substr($name, 18) . '.php';
+        if(file_exists($file)) {
+            require $file;
+            return true;
+        }
+    }
+
     // our own namespace
     if(substr($name, 0, 9) == 'dokuwiki/') {
         require substr($name, 9) . '.php';