diff --git a/src/ng/q.js b/src/ng/q.js
index 5bf1cc80a282..e5be9d2d69ab 100644
--- a/src/ng/q.js
+++ b/src/ng/q.js
@@ -497,6 +497,19 @@ function qFactory(nextTick, exceptionHandler) {
     return result.promise.then(callback, errback, progressBack);
   };
 
+  /**
+   * @ngdoc method
+   * @name $q#resolve
+   * @kind function
+   *
+   * @description
+   * Alias of {@link ng.$q#when when} to maintain naming consistency with ES6.
+   *
+   * @param {*} value Value or a promise
+   * @returns {Promise} Returns a promise of the passed value or promise
+   */
+  var resolve = when;
+
   /**
    * @ngdoc method
    * @name $q#all
@@ -565,6 +578,7 @@ function qFactory(nextTick, exceptionHandler) {
   $Q.defer = defer;
   $Q.reject = reject;
   $Q.when = when;
+  $Q.resolve = resolve;
   $Q.all = all;
 
   return $Q;
diff --git a/test/ng/qSpec.js b/test/ng/qSpec.js
index 643daf4d14bd..dbafc18fcfca 100644
--- a/test/ng/qSpec.js
+++ b/test/ng/qSpec.js
@@ -1643,6 +1643,14 @@ describe('q', function() {
     });
 
 
+    describe('resolve', function() {
+      it('should be an alias of the "when" function', function() {
+        expect(q.resolve).toBeDefined();
+        expect(q.resolve).toEqual(q.when);
+      });
+    });
+
+
     describe('optional callbacks', function() {
       it('should not require success callback and propagate resolution', function() {
         q.when('hi', null, error()).then(success(2), error());