diff --git a/test-support/page-object/properties/click-on-text.js b/test-support/page-object/properties/click-on-text.js
index <HASH>..<HASH> 100644
--- a/test-support/page-object/properties/click-on-text.js
+++ b/test-support/page-object/properties/click-on-text.js
@@ -45,8 +45,10 @@ export function clickOnText(selector, options = {}) {
     isDescriptor: true,
 
     value(textToClick) {
-      wait().then(() => {
-        var actualSelector = findChildElement(this, selector, textToClick, options) || findElement(this, selector, textToClick, options);
+      var that = this;
+
+      wait().then(function() {
+        var actualSelector = findChildElement(that, selector, textToClick, options) || findElement(that, selector, textToClick, options);
 
         click(actualSelector);
       });
diff --git a/test-support/page-object/properties/collection.js b/test-support/page-object/properties/collection.js
index <HASH>..<HASH> 100644
--- a/test-support/page-object/properties/collection.js
+++ b/test-support/page-object/properties/collection.js
@@ -4,7 +4,9 @@ import { create } from '../create';
 import { count } from './count';
 
 function merge(target, ...objects) {
-  objects.forEach(o => Ember.merge(target, o));
+  objects.forEach(function(o) {
+    Ember.merge(target, o);
+  });
 
   return target;
 }
jsdoc doesn't support arrow function