diff --git a/test/index.html b/test/index.html
index 5e98e6806..80790e347 100644
--- a/test/index.html
+++ b/test/index.html
@@ -276,6 +276,7 @@
     <script src="spec/ui/preset/localized.js"></script>
     <script src="spec/ui/preset/wikipedia.js"></script>
 
+    <script src="spec/countrycode.js"></script>
     <script src="spec/geo.js"></script>
     <script src="spec/taginfo.js"></script>
 
diff --git a/test/index_packaged.html b/test/index_packaged.html
index b22e812ee..50617713a 100644
--- a/test/index_packaged.html
+++ b/test/index_packaged.html
@@ -86,6 +86,7 @@
     <script src="spec/ui/preset/localized.js"></script>
     <script src="spec/ui/preset/wikipedia.js"></script>
 
+    <script src="spec/countrycode.js"></script>
     <script src="spec/geo.js"></script>
     <script src="spec/taginfo.js"></script>
 
diff --git a/test/spec/countrycode.js b/test/spec/countrycode.js
new file mode 100644
index 000000000..0382a1d93
--- /dev/null
+++ b/test/spec/countrycode.js
@@ -0,0 +1,98 @@
+describe("iD.countryCode", function() {
+    var server, countryCode;
+
+    beforeEach(function() {
+        server = sinon.fakeServer.create();
+        iD.countryCode.cache = null;
+        countryCode = iD.countryCode();
+    });
+
+    afterEach(function() {
+        server.restore();
+    });
+
+    function query(url) {
+        return iD.util.stringQs(url.substring(url.indexOf('?') + 1));
+    }
+
+    describe("#search", function() {
+        it("calls the given callback with the results of the search query", function() {
+            var callback = sinon.spy();
+            countryCode.search([16, 48], callback);
+
+            server.respondWith("GET", "http://nominatim.openstreetmap.org/reverse?addressdetails=1&format=json&lat=48&lon=16",
+                [200, { "Content-Type": "application/json" },
+                    '{"address":{"country_code":"at"}}']);
+            server.respond();
+
+            expect(query(server.requests[0].url)).to.eql(
+                {format: "json", addressdetails: "1", lat: "48", lon: "16"});
+            expect(callback).to.have.been.calledWith(null, "at");
+        });
+        it("should not cache the first search result", function() {
+            var callback = sinon.spy();
+            countryCode.search([16, 48], callback);
+
+            server.respondWith("GET", "http://nominatim.openstreetmap.org/reverse?addressdetails=1&format=json&lat=48&lon=16",
+                [200, { "Content-Type": "application/json" },
+                    '{"address":{"country_code":"at"}}']);
+            server.respond();
+
+            expect(query(server.requests[0].url)).to.eql(
+                {format: "json", addressdetails: "1", lat: "48", lon: "16"});
+            expect(callback).to.have.been.calledWith(null, "at");
+
+            server.restore();
+            server = sinon.fakeServer.create();
+
+            countryCode.search([17, 49], callback);
+
+            server.respondWith("GET", "http://nominatim.openstreetmap.org/reverse?addressdetails=1&format=json&lat=49&lon=17",
+                [200, { "Content-Type": "application/json" },
+                    '{"address":{"country_code":"cz"}}']);
+            server.respond();
+
+            expect(query(server.requests[0].url)).to.eql(
+                {format: "json", addressdetails: "1", lat: "49", lon: "17"});
+            expect(callback).to.have.been.calledWith(null, "cz");
+        });
+        it("should cache the first search result", function() {
+            var callback = sinon.spy();
+            countryCode.search([16, 48], callback);
+
+            server.respondWith("GET", "http://nominatim.openstreetmap.org/reverse?addressdetails=1&format=json&lat=48&lon=16",
+                [200, { "Content-Type": "application/json" },
+                    '{"address":{"country_code":"at"}}']);
+            server.respond();
+
+            expect(query(server.requests[0].url)).to.eql(
+                {format: "json", addressdetails: "1", lat: "48", lon: "16"});
+            expect(callback).to.have.been.calledWith(null, "at");
+
+            server.restore();
+            server = sinon.fakeServer.create();
+
+            countryCode.search([16.01, 48.01], callback);
+
+            server.respondWith("GET", "http://nominatim.openstreetmap.org/reverse?addressdetails=1&format=json&lat=48.01&lon=16.01",
+                [200, { "Content-Type": "application/json" },
+                    '{"address":{"country_code":"cz"}}']);
+            server.respond();
+
+            expect(callback).to.have.been.calledWith(null, "at");
+        });
+        it("calls the given callback with an error", function() {
+            var callback = sinon.spy();
+            countryCode.search([1000, 1000], callback);
+
+            server.respondWith("GET", "http://nominatim.openstreetmap.org/reverse?addressdetails=1&format=json&lat=1000&lon=1000",
+                [200, { "Content-Type": "application/json" },
+                    '{"error":"Unable to geocode"}']);
+            server.respond();
+
+            expect(query(server.requests[0].url)).to.eql(
+                {format: "json", addressdetails: "1", lat: "1000", lon: "1000"});
+            expect(callback).to.have.been.calledWith("Unable to geocode");
+        });
+    });
+});