diff --git a/.travis.yml b/.travis.yml
index febeba3bbd..a44de23626 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,7 +19,3 @@ script:
   - xvfb-run wct
   - if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then wct --plugin sauce; fi
 dist: trusty
-env:
-  global:
-  - secure: pX4tLk4gZEhsSZndyAIqevtRenC6ssBDDVG9pC3oeA4H3f3OdNNWlfrgAt5cSwxzhYEuLB0kUBkIr9SaZENG5lbronPur4JTklpZHFKPu2/XE3TAMgrcgkttq/0gYdI7F87wjzoEAXi89GbCtB7jal536k8hslpcSG6s7B3ECwU8HVCbbP9leB7cBBWcdlqz33f2/RCKUnnbND2JihmzNMuqBdNyG+TcLSPXcGKCA/8FgIDDtVlZzbPb1LVRTavZrTJUj+NM+BQo54dYgEgvpYKgRGFGXHpqDItVV/riSqmZZqsEEdMriw+o9EFjQQvPIgWciHgzwToxSQjyOk3jaXbmtsCOUqy31aKr/lsnai73mR9bbQIVamPY6D5TsRvI0+fS9khIUfW/Jj8FCPfo2HjfoHxyY+IoAxk/HPGcLdx9Pf6dP1iPvlqNtFdlBISWf3PhANvlmQOVJdg0aYEIf9dO1HPv1k3TddNVuHG/X2iAJePVN9YHhySYDxvmFkJoB5W8qcop1wqYbLJXBkvD1d0V9deTxE1bY7/PG6OEAVbGD8aTpL+cxV0F2cO/bdcfPGmaJiCS7WHK4Wh9sH1OE0bKcNgcI2BNjmlkUMkLtZO1EbflanrCJI9O8gUKUHVH1RVTWcyirY2ccoQCatzNL3bbu5ygk1f87gM4KkE/C50=
-  - secure: dOWapZ2/+33euk4LgeRVAjh89Te9igCxkk5A+0Zv8ukhy8Hx0SNb3JxrbtAdw5lN9//NxX9IbZyp6+P+H/deNGy4U8xFfz8f1aJVuM9v7Fx6Cj5F6PCyDKohJpIhnk8gemAkMepOCYJJyip5xLT8KU3yzfpf5CXn1MuKI7E+HiAZO4taY+7K6afKxKIOst42WEoEfCCgYakJ9Q8qfhCd/1P+m0VoSdRcNdSR6o2bw/hdxyTPiWrzCpRrj76LaypqcioLPChHc/6UEOCTJd3quvBWHWgv5LjQ5IcbvW/z/C9XIpBK7c7g16YX6iGKE1UdJosX6KLKOGWVkrzmC1vnWycJP6UDE6b2MI7Qq0MEJGJoVIKuHbkO7HTxRSyYYZW8TXcCRAEvXwAhBM4fgciDYsogCb1knjgzrsxTuWgRNroG2m5ie8iHIj5aNTBjskDTp+H6lIaflCyPl1ZdNo7LSvHF+uuCTwUBUVvMdE1upAl3VEfKcVOAVyJJgQ1c4/uPo4INgak91A5gcZuenaV0auVEO2eW9izS3SlKTvb2mgP7SM7kF8U+gDUP9OfL697cg2aUDDmNmbSWk/2h5EimXLHP+FaxSrrhtcVOd8XfQ0lyCPtsUpNEyW1RNdiSed1nLBGVCS0ArcK+Q8zqTukIdnVOrWOr2PJ9n0GiRpwjpRY=
diff --git a/src/components/entity/state-info.html b/src/components/entity/state-info.html
index 311fc189c6..c181c1c827 100644
--- a/src/components/entity/state-info.html
+++ b/src/components/entity/state-info.html
@@ -2,6 +2,7 @@
 
 <link rel="import" href="./state-badge.html">
 <link rel="import" href="../ha-relative-time.html">
+<link rel="import" href="../../util/hass-util.html">
 
 <dom-module id="state-info">
   <template>
diff --git a/test/index.html b/test/index.html
index faa528230e..6e968fff25 100644
--- a/test/index.html
+++ b/test/index.html
@@ -9,8 +9,8 @@
 <body>
   <script>
     WCT.loadSuites([
-      'state-info-test.html',
       'state-info-test.html?dom=shadow',
+      'state-info-test.html?dom=shady',
     ]);
   </script>
 </body></html>
diff --git a/test/state-info-test.html b/test/state-info-test.html
index f8455eafd4..7846286ce4 100644
--- a/test/state-info-test.html
+++ b/test/state-info-test.html
@@ -13,15 +13,63 @@
   </test-fixture>
 
   <script>
+    function lightOrShadow(elem, selector) {
+      return elem.shadowRoot ?
+          elem.shadowRoot.querySelector(selector) :
+          elem.querySelector(selector);
+    }
+
     suite('state-info', function() {
       var si;
-      
+
       setup(function() {
         si = fixture('state-info');
+        window.HAWS = {};
+        window.HAWS.extractDomain = function (entityId) {
+          return entityId.substr(0, entityId.indexOf('.'));
+        };
       });
       
-      test('default stateObj', function() {
-        assert.equal(si.stateObj, undefined);
+      test('default values', function() {
+        assert.isUndefined(si.stateObj);
+        assert.isUndefined(si.inDialog);
+      });
+
+      test('has state-badge', function() {
+        assert.isOk(lightOrShadow(si, 'state-badge'));
+      });
+
+      test('stateObj', function(done) {
+        si.stateObj = {entity_id: 'light.demo', last_changed: '2017-01-01T00:00:00+00:00', state: 'off', attributes: {friendly_name: 'Name'}};
+        flush(function() {
+          var stateBadge = lightOrShadow(si, 'state-badge');
+          assert.isOk(stateBadge);
+          assert.deepEqual(stateBadge.stateObj, si.stateObj);
+
+          var name = lightOrShadow(si, '.name');
+          assert.isOk(name, '.name missing');
+          assert.equal(name.textContent, 'Name');
+
+          assert.isNotOk(lightOrShadow(si, 'ha-relative-time'));
+          done();
+        });
+      });
+
+      test('relative time', function(done) {
+        si.stateObj = {entity_id: 'light.demo', last_changed: '2017-01-01T00:00:00+00:00', state: 'off', attributes: {friendly_name: 'Name'}};
+        si.inDialog = true;
+        flush(function() {
+          var relativeTime = lightOrShadow(si, 'ha-relative-time');
+          assert.isOk(relativeTime);
+          assert.notEqual(relativeTime.textContent, 'never');
+          assert.notEqual(relativeTime.textContent, '');
+
+          si.stateObj = {entity_id: 'light.demo', state: 'off', attributes: {friendly_name: 'Name'}};
+          flush(function() {
+            assert.equal(relativeTime.textContent, 'never');
+            done();
+          });
+        });
       });
     });
   </script>
diff --git a/wct.conf.json b/wct.conf.json
index 9e33d34cb7..aa3d60679a 100644
--- a/wct.conf.json
+++ b/wct.conf.json
@@ -18,6 +18,12 @@
           "browserName": "MicrosoftEdge",
           "platform": "Windows 10",
           "version": "14.14393"
+        }, {
+          "deviceName": "Android GoogleAPI Emulator",
+          "platformName": "Android",
+          "platformVersion": "7.0",
+          "browserName": "Chrome",
+          "appiumVersion": "1.6.3"
         }
       ]
     }
