diff --git a/laravel/config.php b/laravel/config.php
index 9ea68946..a26e05a9 100644
--- a/laravel/config.php
+++ b/laravel/config.php
@@ -226,9 +226,9 @@ class Config {
 		// Configuration files can be made specific for a given environment. If an
 		// environment has been set, we will merge the environment configuration
 		// in last, so that it overrides all other options.
-		if (isset($_SERVER['LARAVEL_ENV']))
+		if ( ! is_null(Request::env()))
 		{
-			$paths[] = $paths[count($paths) - 1].$_SERVER['LARAVEL_ENV'].'/';
+			$paths[] = $paths[count($paths) - 1].Request::env().'/';
 		}
 
 		return $paths;
diff --git a/laravel/core.php b/laravel/core.php
index b2fd99f0..5853a049 100644
--- a/laravel/core.php
+++ b/laravel/core.php
@@ -187,7 +187,7 @@ else
 
 if ( ! is_null($environment))
 {
-	Request::foundation()->server->set('LARAVEL_ENV', $environment);
+	Request::set_env($environment);
 }
 
 /*
diff --git a/laravel/request.php b/laravel/request.php
index 3dad614a..8b90dba5 100644
--- a/laravel/request.php
+++ b/laravel/request.php
@@ -197,6 +197,17 @@ class Request {
 		return static::foundation()->server->get('LARAVEL_ENV');
 	}
 
+	/**
+	 * Set the Laravel environment for the current request.
+	 *
+	 * @param  string  $env
+	 * @return void
+	 */
+	public static function set_env($env)
+	{
+		static::foundation()->server->set('LARAVEL_ENV', $env);
+	}
+
 	/**
 	 * Determine the current request environment.
 	 *