diff --git a/lib/puppet/util/run_mode.rb b/lib/puppet/util/run_mode.rb
index a64198150f..cf331e4532 100644
--- a/lib/puppet/util/run_mode.rb
+++ b/lib/puppet/util/run_mode.rb
@@ -81,7 +81,7 @@ def public_dir
       end
 
       def run_dir
-        which_dir("/var/run/puppetlabs", "~/.puppetlabs/var/run")
+        ENV.fetch('RUNTIME_DIRECTORY') { which_dir("/var/run/puppetlabs", "~/.puppetlabs/var/run") }
       end
 
       def log_dir