diff --git a/src/auto/injector.js b/src/auto/injector.js
index 303f36f2dbb7..1362ed15ab24 100644
--- a/src/auto/injector.js
+++ b/src/auto/injector.js
@@ -66,7 +66,7 @@ var FN_ARG_SPLIT = /,/;
 var FN_ARG = /^\s*(_?)(\S+?)\1\s*$/;
 var STRIP_COMMENTS = /((\/\/.*$)|(\/\*[\s\S]*?\*\/))/mg;
 var $injectorMinErr = minErr('$injector');
-function annotate(fn) {
+function annotate(fn, noMagic) {
   var $inject,
       fnText,
       argDecl,
@@ -76,6 +76,9 @@ function annotate(fn) {
     if (!($inject = fn.$inject)) {
       $inject = [];
       if (fn.length) {
+        if (noMagic) {
+          throw $injectorMinErr('nomagic', '');
+        }
         fnText = fn.toString().replace(STRIP_COMMENTS, '');
         argDecl = fnText.match(FN_ARGS);
         forEach(argDecl[1].split(FN_ARG_SPLIT), function(arg){
@@ -587,7 +590,8 @@ function annotate(fn) {
  */
 
 
-function createInjector(modulesToLoad) {
+function createInjector(modulesToLoad, noMagic) {
+  noMagic = (noMagic === true);
   var INSTANTIATING = {},
       providerSuffix = 'Provider',
       path = [],
@@ -605,13 +609,13 @@ function createInjector(modulesToLoad) {
       providerInjector = (providerCache.$injector =
           createInternalInjector(providerCache, function() {
             throw $injectorMinErr('unpr', "Unknown provider: {0}", path.join(' <- '));
-          })),
+          }, noMagic)),
       instanceCache = {},
       instanceInjector = (instanceCache.$injector =
           createInternalInjector(instanceCache, function(servicename) {
             var provider = providerInjector.get(servicename + providerSuffix);
             return instanceInjector.invoke(provider.$get, provider);
-          }));
+          }, noMagic));
 
 
   forEach(loadModules(modulesToLoad), function(fn) { instanceInjector.invoke(fn || noop); });
@@ -745,7 +749,7 @@ function createInjector(modulesToLoad) {
 
     function invoke(fn, self, locals){
       var args = [],
-          $inject = annotate(fn),
+          $inject = annotate(fn, noMagic),
           length, i,
           key;
 
diff --git a/src/loader.js b/src/loader.js
index 5b36827282a2..fc7ac2d15e14 100644
--- a/src/loader.js
+++ b/src/loader.js
@@ -78,7 +78,7 @@ function setupModuleLoader(window) {
      *        {@link angular.Module#config Module#config()}.
      * @returns {module} new module with the {@link angular.Module} api.
      */
-    return function module(name, requires, configFn) {
+    return function module(name, requires, configFn, noMagic) {
       var assertNotHasOwnProperty = function(name, context) {
         if (name === 'hasOwnProperty') {
           throw ngMinErr('badname', 'hasOwnProperty is not a valid {0} name', context);
@@ -86,6 +86,18 @@ function setupModuleLoader(window) {
       };
 
       assertNotHasOwnProperty(name, 'module');
+
+      if (typeof configFn === "boolean") {
+        noMagic = configFn;
+        configFn = undefined;
+      } else if (arguments.length < 4) {
+        noMagic = false;
+      }
+
+      if (noMagic !== true) {
+        noMagic = false;
+      }
+
       if (requires && modules.hasOwnProperty(name)) {
         modules[name] = null;
       }
diff --git a/src/ngMock/angular-mocks.js b/src/ngMock/angular-mocks.js
index a4dc895bf2f0..1cb162365450 100644
--- a/src/ngMock/angular-mocks.js
+++ b/src/ngMock/angular-mocks.js
@@ -2156,7 +2156,12 @@ if(window.jasmine || window.mocha) {
       modules.unshift('ng');
       var injector = currentSpec.$injector;
       if (!injector) {
-        injector = currentSpec.$injector = angular.injector(modules);
+        var noMagic = modules.indexOf(true);
+        if (noMagic >= 0) {
+          modules.splice(noMagic, 1);
+          noMagic = true;
+        }
+        injector = currentSpec.$injector = angular.injector(modules, noMagic);
       }
       for(var i = 0, ii = blockFns.length; i < ii; i++) {
         try {
diff --git a/test/auto/injectorSpec.js b/test/auto/injectorSpec.js
index 4b9679784c0e..572f4906f4b5 100644
--- a/test/auto/injectorSpec.js
+++ b/test/auto/injectorSpec.js
@@ -864,3 +864,41 @@ describe('injector', function() {
     });
   });
 });
+
+describe('$injector noMagic', function() {
+  it('should throw if magic annotation is used by service', function() {
+    module(['$provide', function($provide) {
+      $provide.service({
+        '$test': function() { return this; },
+        '$test2': function($test) { return this; }
+      });
+    }], true);
+    expect (function() {
+      inject(['$test2', function(test2) {}]);
+    }).toThrowMinErr('$injector', 'nomagic');
+  });
+
+
+  it('should throw if magic annotation is used by provider', function() {
+    module(['$provide', function($provide) {
+      $provide.provider({
+        '$test': function() { this.$get = function($rootScope) { return $rootScope; }; },
+      });
+    }], true);
+    expect (function() {
+      inject(['$test', function(test) {}]);
+    }).toThrowMinErr('$injector', 'nomagic');
+  });
+
+
+  it('should throw if magic annotation is used by factory', function() {
+    module(['$provide', function($provide) {
+      $provide.factory({
+        '$test': function($rootScope) { return function() {} },
+      });
+    }], true);
+    expect (function() {
+      inject(['$test', function(test) {}]);
+    }).toThrowMinErr('$injector', 'nomagic');
+  });
+});