diff --git a/cosmogramme/storm_init.php b/cosmogramme/storm_init.php
index f7111d7df07ae0b3c6c2d965c14d0b5d74901535..768cf5d622ae3a70d03a751568ce2c600d6e4a7c 100644
--- a/cosmogramme/storm_init.php
+++ b/cosmogramme/storm_init.php
@@ -47,13 +47,17 @@ require_once "startup.php";
 
 
 $cfg_file = (new CosmoPaths())->getBokehConfigPath();
-(new Bokeh_Engine())
+$bokeh = new Bokeh_Engine();
+$bokeh
   ->setupConstants()
   ->loadConfig($cfg_file)
   ->setupDatabase()
   ->setupDevOptions()
   ->setupHTTPClient()
   ->setupLanguage()
-  ->setupCustomFields()
-  ->setupSession()
-  ->setupControllerActionHelper();
+  ->setupCustomFields();
+
+if (!session_id()) //if in unit tests
+  $bokeh->setupSession();
+
+$bokeh->setupControllerActionHelper();