diff --git a/js/id/ui/inspector.js b/js/id/ui/inspector.js
index 574928f0d..16a1d6a7c 100644
--- a/js/id/ui/inspector.js
+++ b/js/id/ui/inspector.js
@@ -50,7 +50,8 @@ iD.ui.inspector = function() {
         inspectorwrap.append('h4')
             .text(t('edit_tags'));
 
-        tagList = inspectorwrap.append('ul');
+        tagList = inspectorwrap.append('ul')
+            .attr('class', 'tag-list');
 
         var newTag = inspectorwrap.append('button')
                 .attr('class', 'add-tag');
diff --git a/test/spec/ui/inspector.js b/test/spec/ui/inspector.js
index eb5ea6be1..ec257b407 100644
--- a/test/spec/ui/inspector.js
+++ b/test/spec/ui/inspector.js
@@ -43,14 +43,14 @@ describe("iD.ui.inspector", function () {
         element.remove();
         entity = entity.update({tags: {}});
         render();
-        expect(element.selectAll("input.value").property('value')).to.be.empty;
-        expect(element.selectAll("input.key").property('value')).to.be.empty;
+        expect(element.select('.tag-list').selectAll("input.value").property('value')).to.be.empty;
+        expect(element.select('.tag-list').selectAll("input.key").property('value')).to.be.empty;
     });
 
     it("adds tags when clicking the add button", function () {
         element.selectAll("button.add-tag").trigger('click');
-        expect(element.selectAll("input")[0][2].value).to.be.empty;
-        expect(element.selectAll("input")[0][3].value).to.be.empty;
+        expect(element.select('.tag-list').selectAll("input")[0][2].value).to.be.empty;
+        expect(element.select('.tag-list').selectAll("input")[0][3].value).to.be.empty;
     });
 
     it("removes tags when clicking the remove button", function () {