diff --git a/tools/test_env/Dockerfile b/tools/test_env/Dockerfile
index 76ef15c..263208c 100644
--- a/tools/test_env/Dockerfile
+++ b/tools/test_env/Dockerfile
@@ -17,6 +17,7 @@ RUN shinken install webui
 RUN shinken install auth-cfg-password
 RUN pip install influxdb && shinken install mod-influxdb
 RUN shinken install ws-arbiter
+RUN pip install riemann-client && shinken install mod-riemann
 
 ## plugins
 RUN apt-get install -y nagios-plugins
diff --git a/tools/test_env/etc/riemann/riemann.config b/tools/test_env/etc/riemann/riemann.config
index 60d4475..390392b 100644
--- a/tools/test_env/etc/riemann/riemann.config
+++ b/tools/test_env/etc/riemann/riemann.config
@@ -14,12 +14,8 @@
 (periodically-expire 5)
 
 (let [index (index)]
-  ; Inbound events will be passed to these streams:
-  (streams
-    (default :ttl 60
-      ; Index all events immediately.
-      index
-
-      ; Log expired events.
-      (expired
-        (fn [event] (info "expired" event))))))
+ (streams
+     (expired #(prn "Expired" %))
+       (where (not (service #"^riemann "))
+         index
+         #(info "received event" %))))
diff --git a/tools/test_env/etc/shinken/brokers/broker-master.cfg b/tools/test_env/etc/shinken/brokers/broker-master.cfg
index b5d6bf4..4b105b4 100644
--- a/tools/test_env/etc/shinken/brokers/broker-master.cfg
+++ b/tools/test_env/etc/shinken/brokers/broker-master.cfg
@@ -37,7 +37,7 @@ define broker {
     # - graphite                = Use a Graphite time series DB for perfdata
     # - webui                   = Shinken Web interface
     # - glpidb                  = Save data in GLPI MySQL database
-    modules WebUI,mod-influxdb
+    modules WebUI,mod-influxdb,mod-riemann
 
     # Enable https or not
     use_ssl	          0