diff --git a/lib/private/Config.php b/lib/private/Config.php
index 28d8c560c5..7974202666 100644
--- a/lib/private/Config.php
+++ b/lib/private/Config.php
@@ -40,7 +40,7 @@ namespace OC;
  */
 class Config {
 
-	const ENV_PREFIX = 'OC_';
+	const ENV_PREFIX = 'NC_';
 
 	/** @var array Associative array ($key => $value) */
 	protected $cache = array();
@@ -76,7 +76,7 @@ class Config {
 	/**
 	 * Returns a config value
 	 *
-	 * gets its value from an `OC_` prefixed environment variable
+	 * gets its value from an `NC_` prefixed environment variable
 	 * if it doesn't exist from config.php
 	 * if this doesn't exist either, it will return the given `$default`
 	 *
diff --git a/tests/lib/ConfigTest.php b/tests/lib/ConfigTest.php
index f7add114aa..418f7de0ae 100644
--- a/tests/lib/ConfigTest.php
+++ b/tests/lib/ConfigTest.php
@@ -50,7 +50,7 @@ class ConfigTest extends TestCase {
 
 	public function testGetValueReturnsEnvironmentValueIfSet() {
 		$this->assertEquals('bar', $this->config->getValue('foo'));
-		putenv('OC_foo=baz');
+		putenv('NC_foo=baz');
 		$this->assertEquals('baz', $this->config->getValue('foo'));
 	}