diff --git a/angularFiles.js b/angularFiles.js
index 9017da6fc4bd..f72ca42e2e15 100755
--- a/angularFiles.js
+++ b/angularFiles.js
@@ -171,6 +171,7 @@ var angularFiles = {
     'test/auto/*.js',
     'test/ng/**/*.js',
     'test/ngAnimate/*.js',
+    'test/ngMessageFormat/*.js',
     'test/ngMessages/*.js',
     'test/ngCookies/*.js',
     'test/ngResource/*.js',
@@ -208,7 +209,9 @@ var angularFiles = {
     'test/modules/no_bootstrap.js',
     'src/ngScenario/browserTrigger.js',
     'test/helpers/*.js',
+    'test/ngAnimate/*.js',
     'test/ngMessageFormat/*.js',
+    'test/ngMessages/*.js',
     'test/ngMock/*.js',
     'test/ngCookies/*.js',
     'test/ngRoute/**/*.js',
diff --git a/test/helpers/matchers.js b/test/helpers/matchers.js
index f345b15e5890..8ea436250986 100644
--- a/test/helpers/matchers.js
+++ b/test/helpers/matchers.js
@@ -218,7 +218,7 @@ beforeEach(function() {
           };
           var classes = clazz.trim().split(/\s+/);
           for (var i = 0; i < classes.length; ++i) {
-            if (!jqLiteHasClass(actual[0], classes[i])) {
+            if (!angular.element(actual[0]).hasClass(classes[i])) {
               return { pass: isNot };
             }
           }
diff --git a/test/ngMessages/messagesSpec.js b/test/ngMessages/messagesSpec.js
index 5613844bf591..459cbc576f6d 100644
--- a/test/ngMessages/messagesSpec.js
+++ b/test/ngMessages/messagesSpec.js
@@ -12,6 +12,10 @@ describe('ngMessages', function() {
     return str.replace(/\s+/g,'');
   }
 
+  function trim(value) {
+    return isString(value) ? value.trim() : value;
+  }
+
   var element;
   afterEach(function() {
     dealoc(element);