diff --git a/addon/-private/dynamic-attribute-bindings.js b/addon/-private/dynamic-attribute-bindings.js
index cc6c60a..38e38d4 100644
--- a/addon/-private/dynamic-attribute-bindings.js
+++ b/addon/-private/dynamic-attribute-bindings.js
@@ -8,6 +8,7 @@ export default Mixin.create({
     this._super(...arguments);
 
     let newAttributeBindings = [];
+    // eslint-disable-next-line ember/no-attrs-in-components
     for (let key in this.attrs) {
       if (this.NON_ATTRIBUTE_BOUND_PROPS.indexOf(key) === -1 && this.attributeBindings.indexOf(key) === -1) {
         newAttributeBindings.push(key);
diff --git a/tests/dummy/config/environment.js b/tests/dummy/config/environment.js
index 9f7fdca..fda6fa4 100644
--- a/tests/dummy/config/environment.js
+++ b/tests/dummy/config/environment.js
@@ -41,7 +41,7 @@ module.exports = function(environment) {
   }
 
   if (environment === 'production') {
-
+    // here you can enable a production-specific feature
   }
 
   return ENV;
diff --git a/tests/integration/components/bs-datetimepicker-test.js b/tests/integration/components/bs-datetimepicker-test.js
index e294f08..47a9660 100644
--- a/tests/integration/components/bs-datetimepicker-test.js
+++ b/tests/integration/components/bs-datetimepicker-test.js
@@ -1,23 +1,56 @@
-// import { moduleForComponent, test } from 'ember-qunit';
-// import hbs from 'htmlbars-inline-precompile';
+import { module, test } from 'qunit';
+import { setupRenderingTest } from 'ember-qunit';
+import { render, focus } from '@ember/test-helpers';
+import hbs from 'htmlbars-inline-precompile';
 
-// moduleForComponent('bs-datetimepicker', 'Integration | Component | bs datetimepicker', {
-//   integration: true
-// });
+module('Integration | Component | bs datetimepicker', function(hooks) {
+  setupRenderingTest(hooks);
 
-// test('it renders iconClasses and iconText', function(assert) {
-//   assert.expect(2);
+  test('it renders basic input', async function(assert) {
+    assert.expect(1);
 
-//   this.render(hbs`{{bs-datetimepicker date='01/01/2016' iconClasses='material-icons' iconText='date-range'}}`);
+    await render(hbs`{{bs-datetimepicker date='2016-01-01'}}`);
+    assert.dom('input').hasValue('01/01/2016 12:00 AM');
+  });
 
-//   assert.equal(this.$('.input-group-addon i').attr('class'), 'material-icons');
-//   assert.equal(this.$('.input-group-addon i').text().trim(), 'date-range');
-// });
+  test('it renders with default icon classes', async function(assert) {
+    assert.expect(1);
 
-// test('it renders with default icon classes', function(assert) {
-//   assert.expect(1);
+    await render(hbs`{{bs-datetimepicker date='2016-01-01'}}`);
+    assert.dom('.input-group-addon i').hasAttribute('class', 'glyphicon glyphicon-calendar');
+  });
 
-//   this.render(hbs`{{bs-datetimepicker date='01/01/2016'}}`);
+  test('it renders calendar and time icon classes based on isTime argument', async function(assert) {
+    assert.expect(2);
 
-//   assert.equal(this.$('.input-group-addon i').attr('class'), 'glyphicon glyphicon-calendar');
-// });
+    this.set('isTime', false);
+
+    await render(hbs`{{bs-datetimepicker date='2016-01-01' isTime=isTime}}`);
+    assert.dom('.input-group-addon i').hasAttribute('class', 'glyphicon glyphicon-calendar');
+    this.set('isTime', true);
+    assert.dom('.input-group-addon i').hasAttribute('class', 'glyphicon glyphicon-time');
+  });
+
+  test('changing the value will trigger change action', async function(assert) {
+    assert.expect(1);
+
+    const done = assert.async();
+    this.set('callback', date => {
+      assert.equal(date.toISOString(), '2016-01-01T00:00:00.000Z');
+      done();
+    });
+    await render(hbs`{{bs-datetimepicker date="1970-01-01" change=callback}}`);
+    // Set a new Date to trigger the dp.change event
+    this.$('.input-group.date')
+      .data('DateTimePicker')
+      .date(new Date('2016-01-01'));
+  });
+
+  test('opens picker on focus when openOnFocus is enabled', async function(assert) {
+    assert.expect(1);
+
+    await render(hbs`{{bs-datetimepicker date="1970-01-01" openOnFocus=true}}`);
+    await focus('input');
+    assert.dom('.bootstrap-datetimepicker-widget').exists('picker should be shown');
+  });
+});