diff --git a/packages/ember-testing/lib/helpers.js b/packages/ember-testing/lib/helpers.js
index 870b6718110..3c2b19f6947 100644
--- a/packages/ember-testing/lib/helpers.js
+++ b/packages/ember-testing/lib/helpers.js
@@ -182,7 +182,9 @@ function fillIn(app, selector, contextOrText, text) {
   $el = app.testHelpers.findWithAssert(selector, context);
   focus($el);
   run(function() {
-    $el.val(text).change();
+    $el.val(text);
+    $el.trigger('input');
+    $el.change();
   });
   return app.testHelpers.wait();
 }
diff --git a/packages/ember-testing/tests/helpers_test.js b/packages/ember-testing/tests/helpers_test.js
index ca25d7105ce..9332081784f 100644
--- a/packages/ember-testing/tests/helpers_test.js
+++ b/packages/ember-testing/tests/helpers_test.js
@@ -581,6 +581,39 @@ QUnit.test('`fillIn` focuses on the element', function() {
   });
 });
 
+QUnit.test('`fillIn` fires `input` and `change` events in the proper order', function() {
+  expect(1);
+
+  var fillIn, visit, andThen;
+  var events = [];
+  App.IndexController = Ember.Controller.extend({
+    actions: {
+      oninputHandler(e) {
+        events.push(e.type);
+      },
+      onchangeHanlders(e) {
+        events.push(e.type);
+      }
+    }
+  });
+
+  App.IndexView = EmberView.extend({
+    template: compile('<input type="text" id="first" oninput={{action "oninputHandler"}} onchange={{action "onchangeHanlders"}}>')
+  });
+
+  run(App, App.advanceReadiness);
+
+  fillIn = App.testHelpers.fillIn;
+  visit = App.testHelpers.visit;
+  andThen = App.testHelpers.andThen;
+
+  visit('/');
+  fillIn('#first', 'current value');
+  andThen(function() {
+    deepEqual(events, ['input', 'change'], '`input` and `change` events are fired in the proper order');
+  });
+});
+
 if (isEnabled('ember-testing-checkbox-helpers')) {
   QUnit.test('`check` ensures checkboxes are `checked` state for checkboxes', function() {
     expect(2);