diff --git a/lib/cdist/context.py b/lib/cdist/context.py
index cf314409..ed1fd31d 100644
--- a/lib/cdist/context.py
+++ b/lib/cdist/context.py
@@ -41,6 +41,8 @@ class Context(object):
         debug=False):
 
         self.debug      = debug
+        if self.debug:
+            os.environ['__debug'] = 'yes'
 
         self.target_host    = target_host