diff --git a/bower.json b/bower.json
index 66a3f6f..6183ef9 100644
--- a/bower.json
+++ b/bower.json
@@ -29,7 +29,7 @@
     "paper-button": "PolymerElements/paper-button#^1.0.0",
     "paper-styles": "PolymerElements/paper-styles#^1.0.0",
     "test-fixture": "PolymerElements/test-fixture#^1.0.0",
-    "web-component-tester": "*",
+    "web-component-tester": "polymer/web-component-tester#^3.4.0",
     "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
   },
   "main": "paper-drawer-panel.html",
diff --git a/test/index.html b/test/index.html
index 1090a41..1509baa 100644
--- a/test/index.html
+++ b/test/index.html
@@ -19,7 +19,9 @@
   <script>
     WCT.loadSuites([
       'positioning.html',
-      'small-devices.html'
+      'small-devices.html',
+      'positioning.html?dom=shadow',
+      'small-devices.html?dom=shadow'
     ]);
   </script>
 </body>
diff --git a/test/positioning.html b/test/positioning.html
index 64f0ada..f70c2cf 100644
--- a/test/positioning.html
+++ b/test/positioning.html
@@ -16,9 +16,6 @@
 
   <script src="../../webcomponentsjs/webcomponents-lite.js"></script>
   <script src="../../web-component-tester/browser.js"></script>
-  <script src="../../test-fixture/test-fixture-mocha.js"></script>
-
-  <link rel="import" href="../../test-fixture/test-fixture.html">
   <link rel="import" href="../paper-drawer-panel.html">
 </head>
 <style>
@@ -53,8 +50,8 @@
       test('drawer is positioned correctly', function(done) {
         var f, drawer, main;
         f = fixture('left-drawer');
-        drawer = f.querySelector('#drawer');
-        main = f.querySelector('#main');
+        drawer = f.$$('#drawer');
+        main = f.$$('#main');
 
         Polymer.Base.async(function() {
           var drawerStyle = window.getComputedStyle(drawer);
@@ -72,13 +69,13 @@
       test('right-drawer is positioned correctly', function(done) {
         var f, drawer, main;
         f = fixture('right-drawer');
-        drawer = f.querySelector('#drawer');
-        main = f.querySelector('#main');
+        drawer = f.$$('#drawer');
+        main = f.$$('#main');
 
         Polymer.Base.async(function() {
           var drawerStyle = window.getComputedStyle(drawer);
           expect(drawerStyle.right).to.be.equal('0px');
-          
+
           try {
             expect(drawerStyle.left).to.be.equal('auto');
           } catch(e) {
diff --git a/test/small-devices.html b/test/small-devices.html
index adaae88..b3091cb 100644
--- a/test/small-devices.html
+++ b/test/small-devices.html
@@ -16,9 +16,6 @@
 
   <script src="../../webcomponentsjs/webcomponents-lite.js"></script>
   <script src="../../web-component-tester/browser.js"></script>
-  <script src="../../test-fixture/test-fixture-mocha.js"></script>
-
-  <link rel="import" href="../../test-fixture/test-fixture.html">
   <link rel="import" href="../paper-drawer-panel.html">
 </head>
 <style>
@@ -61,8 +58,8 @@
       test('drawer is hidden by default', function(done) {
         var f, panel, drawer, main;
         f = fixture('left-drawer');
-        drawer = f.querySelector('#drawer');
-        main = f.querySelector('#main');
+        drawer = f.$$('#drawer');
+        main = f.$$('#main');
 
         f.set('forceNarrow', true);
         f._forceNarrowChanged();
@@ -80,8 +77,8 @@
       test('right-drawer is hidden by default', function(done) {
         var f, panel, drawer, main;
         f = fixture('right-drawer');
-        drawer = f.querySelector('#drawer');
-        main = f.querySelector('#main');
+        drawer = f.$$('#drawer');
+        main = f.$$('#main');
 
         f.set('forceNarrow', true);
         f._forceNarrowChanged();
@@ -95,11 +92,11 @@
         });
       });
 
-     test('drawer is can be opened', function(done) {
+     test('drawer can be opened', function(done) {
         var f, panel, drawer, main;
         f = fixture('left-drawer');
-        drawer = f.querySelector('#drawer');
-        main = f.querySelector('#main');
+        drawer = f.$$('#drawer');
+        main = f.$$('#main');
 
         f.set('forceNarrow', true);
         f._forceNarrowChanged();
@@ -119,8 +116,8 @@
       test('right-drawer can be closed', function(done) {
         var f, panel, drawer, main;
         f = fixture('right-drawer');
-        drawer = f.querySelector('#drawer');
-        main = f.querySelector('#main');
+        drawer = f.$$('#drawer');
+        main = f.$$('#main');
 
         f.set('forceNarrow', true);
         f._forceNarrowChanged();
@@ -134,7 +131,7 @@
           done();
         });
       });
-      
+
     });
   </script>
 </body>