diff --git a/test/core-ajax-multivalue.html b/test/core-ajax-multivalue.html
new file mode 100644
index 0000000..c56e88b
--- /dev/null
+++ b/test/core-ajax-multivalue.html
@@ -0,0 +1,59 @@
+<!doctype html>
+<!--
+Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+Code distributed by Google as part of the polymer project is also
+subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+-->
+<html>
+<head>
+  <title>core-ajax</title>
+  <script src="../../webcomponentsjs/webcomponents.js"></script>
+  <script src="../../web-component-tester/browser.js"></script>
+  <link rel="import" href="../core-ajax.html">
+</head>
+<body>
+
+  <core-ajax></core-ajax>
+
+  <script>
+  suite('multivalue', function(){
+    var animationFrameFlush = function(callback) {
+      flush(function(){
+        requestAnimationFrame(function(){
+          flush(callback);
+        });
+      });
+    };
+    var ajax, requests, xhr;
+    suiteSetup(function(done){
+      ajax = document.querySelector("core-ajax");
+      requests = []
+      xhr = sinon.useFakeXMLHttpRequest();
+      xhr.onCreate = function(xhr) {
+        requests.push(xhr);
+      };
+      async.series([
+          function(cb){
+            ajax.url="http://gdata.youtube.com/feeds/api/videos/";
+            ajax.params='{"alt":"json", "q":"chrome", "keywords":["chrome", "browser"]}';
+            ajax.handleAs="json";
+            ajax.auto=true;
+            cb();
+          },
+          animationFrameFlush
+        ], done);
+    });
+    
+    test('Array valued parameters should be properly encoded', function(done) {
+      var req = requests[0];
+      assert.match(req.url, /[?&]keywords=chrome/);
+      assert.match(req.url, /[?&]keywords=browser/);
+      done();
+    });
+  });
+</script>
+</body>
+</html>
diff --git a/test/core-ajax-progress.html b/test/core-ajax-progress.html
new file mode 100644
index 0000000..0d426a6
--- /dev/null
+++ b/test/core-ajax-progress.html
@@ -0,0 +1,113 @@
+<!doctype html>
+<!--
+Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+Code distributed by Google as part of the polymer project is also
+subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+-->
+<html>
+<head>
+  <title>core-ajax</title>
+
+  <script src="../../webcomponentsjs/webcomponents.js"></script>
+  <script src="../../web-component-tester/browser.js"></script>
+
+
+
+  <link rel="import" href="../core-ajax.html">
+
+</head>
+<body>
+
+  <core-ajax
+    handleAs="json"
+    auto></core-ajax>
+
+<!--
+    Test consistency of core-ajax's loading properties.
+  -->
+  <script>
+    test('progress', function(done) {
+      var ajax = document.querySelector("core-ajax");
+      var xhr = sinon.useFakeXMLHttpRequest();
+      var headers = {
+        "Content-Type": "text/json"
+      };
+      var body = '{"content": "plentiful"}'
+      var requests = this.requests = [];
+      xhr.onCreate = function (xhr) {
+          requests.push(xhr);
+          // Polymer inspects the xhr object for the precense of onprogress to determine
+          // whether to attach an event listener.
+          xhr['onprogress'] = null;
+      };
+      var animationFrameFlush = function(callback) {
+        requestAnimationFrame(function(){
+          flush(callback);
+        })
+      };
+      var progressEvent = function(lengthComputable, loaded, total) {
+        var progress = new ProgressEvent('progress', {
+          lengthComputable: lengthComputable,
+          loaded: loaded,
+          total: total
+        });
+        return progress;
+      }
+
+      // Fake a file download by sending multiple progress events.
+      async.series([
+        function(cb) {
+          ajax.url="http://example.org/downloadLargeFile"
+          cb();
+        },
+        flush,
+        animationFrameFlush,
+        function(cb) {
+          requests[0].dispatchEvent(progressEvent(true, 10, 100));
+          cb();
+        },
+        flush,
+        animationFrameFlush,
+        function(cb) {
+          assert(ajax.loading === true,
+              "Request partially complete, but loading property was false.");
+          var progress = ajax.progress;
+          assert(progress.lengthComputable, "Progress should be computable");
+          assert(progress.loaded == 10, "Expected 10 bytes loaded, got " + progress.loaded);
+          assert(progress.total == 100, "Expected 100 bytes total, got " + progress.total);
+          cb();
+        },
+        animationFrameFlush,
+        function(cb) {
+          requests[0].dispatchEvent(progressEvent(true, 100, 100));
+          cb();
+        },
+        animationFrameFlush,
+        function(cb) {
+          assert(ajax.loading === true,
+              "Request partially complete, but loading property was false.");
+          var progress = ajax.progress;
+          assert(progress.lengthComputable, "Progress should be computable");
+          assert(progress.loaded == 100, "Expected 10 bytes loaded, got " + progress.loaded);
+          assert(progress.total == 100, "Expected 100 bytes total, got " + progress.total);
+          cb();
+        },
+        function(cb) {
+          requests[0].respond(200, headers, body);
+          cb();
+        },
+        animationFrameFlush,
+        function(cb) {
+          assert(ajax.loading === false,
+              "Request complete, but loading property was true.");
+          assert(ajax.response.content === "plentiful", "response not parsed");
+          cb();
+        }
+      ], done);
+    });
+</script>
+</body>
+</html>
diff --git a/test/core-ajax-race.html b/test/core-ajax-race.html
new file mode 100644
index 0000000..ffca971
--- /dev/null
+++ b/test/core-ajax-race.html
@@ -0,0 +1,88 @@
+<!doctype html>
+<!--
+Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+Code distributed by Google as part of the polymer project is also
+subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+-->
+<html>
+<head>
+  <title>core-ajax</title>
+
+  <script src="../../webcomponentsjs/webcomponents.js"></script>
+  <script src="../../web-component-tester/browser.js"></script>
+
+
+
+  <link rel="import" href="../core-ajax.html">
+
+</head>
+<body>
+
+  <core-ajax
+    handleAs="json"
+    auto></core-ajax>
+
+<!--
+    Test that when core-ajax fires multiple times as requests are updated,
+    only the response from the most recent request is used to update the response
+    object.
+  -->
+  <script>
+    test('race-condition', function(done) {
+      var ajax = document.querySelector("core-ajax");
+      var xhr = sinon.useFakeXMLHttpRequest();
+      var headers = {
+        "Content-Type": "text/json"
+      };
+      var body = function(url) {
+        return '{"url": "' + url + '"}';
+      };
+      var requests = [];
+      xhr.onCreate = function (xhr) {
+          requests.push(xhr);
+      };
+      var animationFrameFlush = function(callback) {
+        requestAnimationFrame(function(){
+          flush(callback);
+        })
+      };
+
+      // Make request1, then request2. request2 returns first, followed by request1.
+      async.series([
+        function(cb) {
+          ajax.url="http://example.org/request1"
+          cb();
+        },
+        flush,
+        animationFrameFlush,
+        function(cb) {
+          ajax.url="http://example.org/request2"
+          cb();
+        },
+        flush,
+        animationFrameFlush,
+        function(cb) {
+          requests[0].respond(200, headers, body("http://example.org/request2"));
+          cb();
+        },
+        flush,
+        function(cb) {
+          requests[1].respond(200, headers, body("http://example.org/request1"));
+          cb();
+        },
+        flush,
+        function(cb) {
+          assert(ajax.response.url.match('request1'),
+              "Race condition detected. An earlier request's delayed response " +
+              "caused the more recent request's response to be overwritten.");
+          done();
+          cb();
+        }
+      ], function(){});
+    });
+</script>
+</body>
+</html>
diff --git a/test/core-ajax.html b/test/core-ajax.html
new file mode 100644
index 0000000..9180fe3
--- /dev/null
+++ b/test/core-ajax.html
@@ -0,0 +1,332 @@
+<!doctype html>
+<!--
+Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
+This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
+The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
+The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
+Code distributed by Google as part of the polymer project is also
+subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
+-->
+<html>
+<head>
+  <title>core-ajax</title>
+
+  <script src="../../webcomponentsjs/webcomponents.js"></script>
+  <script src="../../web-component-tester/browser.js"></script>
+
+  <link rel="import" href="../core-ajax.html">
+
+</head>
+<body>
+  <core-ajax></core-ajax>
+
+  <script>
+  suite('core-ajax', function() {
+    var xhr, requests, ajax;
+    suiteSetup(function() {
+      xhr = sinon.useFakeXMLHttpRequest();
+      ajax = document.querySelector("core-ajax");
+      xhr.onCreate = function (xhr) {
+        requests.push(xhr);
+      };
+      // Reset the core-ajax element before each test.
+      ajax.auto = false;
+      ajax.url = '';
+      ajax.params = '';
+      ajax.handleAs = 'text';
+      ajax.body = '';
+    });
+    setup(function() {
+      requests = [];
+    });
+    suite('handleAs', function() {
+      suite('text', function(){
+        var headers = {
+          "Content-Type": "text/plain"
+        };
+        setup(function(done){
+          async.series([
+            function(cb){
+              ajax.handleAs = 'text';
+              ajax.url = "http://example.com/text"
+              ajax.auto = true;
+              cb();
+            },
+            flush,
+            function(cb) {
+              requestAnimationFrame(function(){
+                cb();
+              });
+            },
+            function(cb){
+              requests[0].respond(200, headers, "test text");
+              cb();
+            }
+            ], done);
+        });
+        test('Raw text should pass through', function(){
+          assert.equal(ajax.response, "test text")
+        });
+      });
+      suite('xml', function(){
+        var headers = {
+          "Content-Type": "text/xml"
+        };
+        setup(function(done){
+          async.series([
+            function(cb){
+              ajax.handleAs = 'xml';
+              ajax.url = "http://example.com/xml"
+              ajax.auto = true;
+              cb();
+            },
+            flush,
+            function(cb) {
+              requestAnimationFrame(function(){
+                cb();
+              });
+            },
+            function(cb){
+              requests[0].respond(200, headers,
+                          "<note>" +
+                          "<to>AJ</to>" +
+                          "<from>Dog</from>" +
+                          "<subject>Reminder</subject>" +
+                          "<body><q>Feed me!</q></body>" +
+                          "</note>");
+              cb();
+            }
+            ], done);
+        });
+        test('XML should be returned with queryable structure', function(){
+          var q = ajax.response.querySelector("note body q");
+          assert.equal(q.childNodes[0].textContent, "Feed me!");
+          var to = ajax.response.querySelector("to");
+          assert.equal(to.childNodes[0].textContent, "AJ");
+        })});
+      suite('json', function(){
+        var headers = {
+          "Content-Type": "text/json"
+        };
+        setup(function(done){
+          async.series([
+            function(cb){
+              ajax.handleAs = 'json';
+              ajax.url = "http://example.com/json"
+              ajax.auto = true;
+              cb();
+            },
+            flush,
+            function(cb) {
+              requestAnimationFrame(function(){
+                cb();
+              });
+            },
+            function(cb){
+              requests[0].respond(200, headers,
+                          '{"object" : {"list" : [2, 3, {"key": "value"}]}}');
+              cb();
+            }
+            ], done);
+        });
+        test('JSON should be returned as an Object', function(){
+          var r = ajax.response;
+          assert.equal(r.object.list[1], 3);
+          assert.equal(r.object.list[2].key, "value");
+        });
+      });
+      suite('arraybuffer', function(){
+        var headers = {
+          "Content-Type": "text/plain"
+        };
+        setup(function(done){
+          async.series([
+            function(cb){
+              ajax.handleAs = 'arraybuffer';
+              ajax.url = "http://example.com/data"
+              ajax.auto = true;
+              cb();
+            },
+            flush,
+            function(cb) {
+              requestAnimationFrame(function(){
+                cb();
+              });
+            },
+            function(cb){
+              var buf = new ArrayBuffer(8*4);
+              var resp = new Int32Array(buf);
+              resp[3] = 12;
+              resp[6] = 21;
+              requests[0].response = buf;
+              requests[0].respond(200, headers, 'blahblahblah');
+              cb();
+            }
+            ], done);
+        });
+        test('arraybuffer response should be passed through', function(){
+          var r = ajax.response;
+          var ints = new Int32Array(r);
+          assert.equal(ints[3], 12);
+          assert.equal(ints[6], 21);
+        });
+      });
+      suite('blob', function(){});
+      suite('document', function(){});
+    });
+    suite('auto', function() {
+      suiteSetup(function(){
+        ajax.url = "http://example.com/"
+        ajax.auto = true;
+      });
+      test('url change should trigger request', function(done){
+        async.series([
+          function(cb){
+            ajax.url = "http://example.com/auto";
+            cb();
+          },
+          flush,
+          function(cb) {
+            requestAnimationFrame(function(){
+              cb();
+            });
+          },
+          function(cb){
+            assert.equal(requests.length, 1);
+            cb();
+          }
+          ], done);
+      });
+      test('params change should trigger request', function(done){
+        async.series([
+          function(cb){
+            ajax.params = {param: "value"};
+            cb();
+          },
+          flush,
+          function(cb) {
+            requestAnimationFrame(function(){
+              cb();
+            });
+          },
+          function(cb){
+            assert.equal(requests.length, 1);
+            cb();
+          }
+          ], done);
+      });
+      test('body change should trigger request', function(done){
+        async.series([
+          function(cb){
+            ajax.method = "POST";
+            ajax.body = "bodystuff";
+            cb();
+          },
+          flush,
+          function(cb) {
+            requestAnimationFrame(function(){
+              cb();
+            });
+          },
+          function(cb){
+            assert.equal(requests.length, 1);
+            cb();
+          }
+          ], done);
+      });
+    });
+    suite('events', function(){
+      var headers = {
+        "Content-Type": "text/plain"
+      };
+      var body = "somebodytext";
+      var responded;
+      setup(function(done){
+        async.series([
+          function(cb){
+            ajax.auto = false;
+            cb();
+          },
+          flush,
+          function(cb) {
+            requestAnimationFrame(function(){
+              cb();
+            });
+          },
+          function(cb){;
+            ajax.handleAs = 'text';
+            ajax.url = "http://example.com/text"
+            ajax.auto = true;
+            cb();
+          },
+          flush,
+          function(cb) {
+            requestAnimationFrame(function(){
+              cb();
+            });
+          }
+          ], done);
+        responded = false;
+      });
+      suite('core-response', function(){
+        test('core-response should be fired on success', function(done){
+          window.addEventListener('core-response', function(response, xhr){
+            responded = true;
+          });
+          requests[0].respond(200, headers, body);
+          assert.isTrue(responded);
+          done();
+        });
+        test('core-response should not be fired on failure', function(done){
+          window.addEventListener('core-response', function(response, xhr){
+            responded = true;
+          });
+          requests[0].respond(404, headers, body);
+          assert.isFalse(responded);
+          done();
+        });
+      });
+      suite('core-error', function(){
+        test('core-error should be fired on failure', function(done){
+          window.addEventListener('core-error', function(response, xhr){
+            responded = true;
+          });
+          requests[0].respond(404, headers, body);
+          assert.isTrue(responded);
+          done();
+        });
+        test('core-error should not be fired on success', function(done){
+          var responded = false;
+          window.addEventListener('core-error', function(response, xhr){
+            responded = true;
+          });
+          requests[0].respond(200, headers, body);
+          assert.isFalse(responded);
+          done();
+        });
+      });
+      suite('core-complete', function(){
+        test('core-complete should be fired on success', function(done){
+          window.addEventListener('core-complete', function(response, xhr){
+            responded = true;
+          });
+          requests[0].respond(200, headers, body);
+          assert.isTrue(responded);
+          done();
+        });
+        test('core-complete should be fired on failure', function(done){
+          var responded = false;
+          window.addEventListener('core-complete', function(response, xhr){
+            responded = true;
+          });
+          requests[0].respond(404, headers, body);
+          assert.isTrue(responded);
+          done();
+        });
+      });
+    });
+  });
+  </script>
+
+</body>
+</html>
diff --git a/test/index.html b/test/index.html
new file mode 100644
index 0000000..4e0a19e
--- /dev/null
+++ b/test/index.html
@@ -0,0 +1,18 @@
+<!doctype html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <script src="../../webcomponentsjs/webcomponents.js"></script>
+    <script src="../../web-component-tester/browser.js"></script>
+  </head>
+  <body>
+    <script>
+      WCT.loadSuites([
+        'core-ajax.html',
+        'core-ajax-multivalue.html',
+        'core-ajax-progress.html',
+        'core-ajax-race.html',
+      ]);
+    </script>
+  </body>
+</html>
diff --git a/tests/html/core-ajax-progress-and-loading.html b/tests/html/core-ajax-progress-and-loading.html
deleted file mode 100644
index a8f262f..0000000
--- a/tests/html/core-ajax-progress-and-loading.html
+++ /dev/null
@@ -1,121 +0,0 @@
-<!doctype html>
-<!--
-Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
-This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
-The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
-The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
-Code distributed by Google as part of the polymer project is also
-subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
--->
-<html>
-<head>
-  <title>core-ajax-response-and-error</title>
-
-  <script src="../../../webcomponentsjs/webcomponents.js"></script>
-  <script src="../../../polymer-test-tools/chai/chai.js"></script>
-  <script src="../../../polymer-test-tools/htmltest.js"></script>
-
-  <link rel="import" href="../../core-ajax.html">
-  <link rel="import" href="../../../core-range/core-range.html">
-
-</head>
-<body>
-
-  <polymer-element name="race-condition">
-    <template>
-      <!-- TODO: change this from /headers to /drip if we can get httpbin to
-                 send a Content-Length with their /drip response.
-                 The delay is needed so that we can make assertions about
-                 the intermediate state in browsers that are slow to
-                 notice attribute changes.
-
-                 https://github.com/kennethreitz/httpbin/pull/160
-                 -->
-      <core-ajax
-          auto url="http://httpbin.org/delay/1"
-          loading="{{loading}}" progress="{{progress}}"
-          on-core-response="{{responseReceived}}"></core-ajax>
-      <core-range
-            id="range"
-            value="{{progress.loaded}}"
-            min="0"
-            max="{{progress.total}}"
-            ratio="{{ratio}}">
-      </core-range>
-    </template>
-    <script>
-      Polymer({
-        numbytes: 1000,
-        loading: null,
-        loadingWasTrue: false,
-        loadingFinished: false,
-        previousLoaded: null,
-        domReady: function() {
-          // This will fail the test if it neither passes nor fails in time.
-          this.finalTimeout = setTimeout(function() {
-            chai.assert.fail('', '', 'Test timed out.');
-          }, 3000);
-        },
-        loadingChanged: function() {
-          this.assertConsistent();
-        },
-        progressChanged: function() {
-          this.assertConsistent();
-        },
-        responseReceived: function() {
-          // Shortly after the response is received we should settle into
-          // the final consistent state for the element.
-          setTimeout(function() {
-            chai.assert.equal(this.loading, false,
-                              'Should no longer be loading');
-            chai.assert.equal(
-                this.loadingWasTrue, true,
-                'For a little while, we should have been loading.');
-            if (this.progress && this.progress.lengthComputable) {
-              chai.assert.equal(this.progress.total, this.progress.loaded);
-            }
-            this.assertConsistent();
-            clearTimeout(this.finalTimeout);
-            done();
-          }.bind(this), 300);
-        },
-        assertConsistent: function() {
-          if (this.progress && this.progress.lengthComputable) {
-            chai.assert.isNumber(this.progress.total);
-            chai.assert.isNumber(this.progress.loaded);
-            chai.assert.isNumber(this.ratio);
-            chai.assert(this.progress.loaded >= 0,
-                        'Bytes loaded should not be negative.');
-            if (this.progress.loaded > 0) {
-              this.$.range.update();
-              chai.assert(this.ratio > 0,
-                          'If bytes loaded is >0, % loaded must be >0.');
-            }
-            chai.assert(this.progress.loaded <= this.progress.total,
-                        'Bytes loaded should be less than or equal the total.');
-            if (this.previousLoaded !== null) {
-              chai.assert(this.progress.loaded >= this.previousLoaded,
-                          'Bytes loaded should increase monotonically.');
-            }
-            this.previousLoaded = this.progress.loaded;
-            console.log(this.progress.loaded + ' of ' + this.progress.total);
-          }
-          if (this.loading === true) {
-            this.loadingWasTrue = true;
-          }
-          if (this.loadingWasTrue && this.loading === false) {
-            this.loadingFinished = true;
-          }
-          if (this.loadingFinished) {
-            chai.assert.equal(
-                this.loading, false,
-                'Once loaded, the request should stay that way');
-          }
-        }
-      });
-    </script>
-  </polymer-element>
-
-  <race-condition></race-condition>
-</body>
-</html>
diff --git a/tests/html/core-ajax-response-and-error.html b/tests/html/core-ajax-response-and-error.html
deleted file mode 100644
index a4a817e..0000000
--- a/tests/html/core-ajax-response-and-error.html
+++ /dev/null
@@ -1,109 +0,0 @@
-<!doctype html>
-<!--
-Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
-This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
-The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
-The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
-Code distributed by Google as part of the polymer project is also
-subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
--->
-<html>
-<head>
-  <title>core-ajax-response-and-error</title>
-
-  <script src="../../../webcomponentsjs/webcomponents.js"></script>
-  <script src="../../../polymer-test-tools/chai/chai.js"></script>
-  <script src="../../../polymer-test-tools/htmltest.js"></script>
-
-  <link rel="import" href="../../core-ajax.html">
-
-</head>
-<body>
-
-  <polymer-element name="race-condition">
-    <template>
-      <style>section {margin-top: 20px;}</style>
-      <core-ajax
-          id='ajax'
-          url="http://httpbin.org/delay/{{delay}}"
-          handleas="json" auto
-          response="{{response}}"
-          on-core-response="{{handleResponse}}"></core-ajax>
-      <div>Response url: {{response.url}}</div>
-      <div>Result: {{testResult}}</div>
-
-      <section>
-        <div>Requests</div>
-        <ul>
-          <template repeat='{{request in requests}}'>
-            <li>
-              {{request.delay}} second delay, Status: {{request.statusText}}
-            </li>
-          </template>
-        </ul>
-      </section>
-    </template>
-    <script>
-      Polymer({
-        delay: 1,
-        response: null,
-        testResult: 'pending...',
-        passed: false,
-        requests: [],
-        observe: {
-          '$.ajax.activeRequest': 'requestChanged'
-        },
-        domReady: function() {
-          setTimeout(function() {
-            if (this.response != null) {
-              console.error('HTTP request returned too quick!')
-              chai.assert.fail(
-                  '', '',  'Indeterminate, initial request returned too quick');
-              this.testResult = 'indeterminate';
-              return;
-            }
-            this.delay = 2;
-          }.bind(this), 100);
-          // This will fail the test if it neither passes nor fails in time.
-          this.finalTimeout = setTimeout(function() {
-            chai.assert.fail('', '', 'Test timed out.');
-          }, 7000);
-        },
-        responseChanged: function() {
-          if (this.response.url != this.$.ajax.url) {
-            this.testResult = 'FAIL';
-            chai.assert.fail(this.$.ajax.url, this.response.url,
-                             'Race condition in response attribute');
-            return;
-          }
-          this.passed = true;
-        },
-        passedChanged: function() {
-          if (this.passed && this.testResult == 'pending...') {
-            this.testResult = 'PASS';
-            clearTimeout(this.finalTimeout);
-            done();
-          }
-        },
-        requestChanged: function(o, n) {
-          this.requests.push({
-            'statusText': 'pending',
-            xhr: n,
-            delay: this.delay
-          });
-        },
-        handleResponse: function(resp) {
-          var xhr = resp.detail.xhr;
-          for (var i = 0; i < this.requests.length; i++) {
-            if (this.requests[i].xhr === xhr) {
-              this.requests[i].statusText = xhr.statusText;
-            }
-          }
-        },
-      });
-    </script>
-  </polymer-element>
-
-  <race-condition></race-condition>
-</body>
-</html>
diff --git a/tests/html/core-ajax.html b/tests/html/core-ajax.html
deleted file mode 100644
index 318d052..0000000
--- a/tests/html/core-ajax.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!doctype html>
-<!--
-Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
-This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
-The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt
-The complete set of contributors may be found at http://polymer.github.io/CONTRIBUTORS.txt
-Code distributed by Google as part of the polymer project is also
-subject to an additional IP rights grant found at http://polymer.github.io/PATENTS.txt
--->
-<html>
-<head>
-  <title>core-ajax</title>
-
-  <script src="../../../webcomponentsjs/webcomponents.js"></script>
-  <script src="../../../polymer-test-tools/chai/chai.js"></script>
-  <script src="../../../polymer-test-tools/htmltest.js"></script>
-
-  <link rel="import" href="../../core-ajax.html">
-
-</head>
-<body>
-
-  <core-ajax
-    url="http://gdata.youtube.com/feeds/api/videos/"
-    params='{"alt":"json", "q":"chrome"}'
-    handleAs="json"
-    auto></core-ajax>
-
-  <script>
-
-    document.addEventListener('polymer-ready', function() {
-      var assert = chai.assert;
-      var ajax = document.querySelector('core-ajax');
-      ajax.addEventListener("core-response", function(event) {
-        assert.isTrue(event.detail.response.feed.entry.length > 0);
-        done();
-      });
-    });
-
-  </script>
-
-</body>
-</html>
diff --git a/tests/js/htmltests.js b/tests/js/htmltests.js
deleted file mode 100644
index fdf13dc..0000000
--- a/tests/js/htmltests.js
+++ /dev/null
@@ -1,5 +0,0 @@
-htmlSuite('core-ajax', function() {
-  htmlTest('html/core-ajax.html');
-  htmlTest('html/core-ajax-response-and-error.html');
-  htmlTest('html/core-ajax-progress-and-loading.html');
-});
diff --git a/tests/runner.html b/tests/runner.html
deleted file mode 100644
index 26829de..0000000
--- a/tests/runner.html
+++ /dev/null
@@ -1,14 +0,0 @@
-<!doctype htmlz>
-<html>
-<head>
-  <meta charset="UTF-8">
-  <meta name="viewport" content="width=device-width, minimum-scale=1.0, initial-scale=1.0, user-scalable=yes">
-  <title>Web Component Test Runner</title>
-  <script src="../../polymer-test-tools/ci-support.js"></script>
-</head>
-<body>
-  <script>
-    runTests('tests.json');
-  </script>
-</body>
-</html>
diff --git a/tests/tests.json b/tests/tests.json
deleted file mode 100644
index f455f4c..0000000
--- a/tests/tests.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-  "tools": ["chai", "mocha-tdd"],
-  "tests": [
-    "js/htmltests.js"
-  ]
-}
\ No newline at end of file
