diff --git a/spec/features/admin/configuration/taxonomies_spec.rb b/spec/features/admin/configuration/taxonomies_spec.rb
new file mode 100644
index 0000000000..f6e260a31a
--- /dev/null
+++ b/spec/features/admin/configuration/taxonomies_spec.rb
@@ -0,0 +1,52 @@
+require 'spec_helper'
+
+describe "Taxonomies" do
+  stub_authorization!
+
+  before(:each) do
+    visit spree.admin_path
+    click_link "Configuration"
+  end
+
+  context "show" do
+    it "should display existing taxonomies" do
+      create(:taxonomy, :name => 'Brand')
+      create(:taxonomy, :name => 'Categories')
+      click_link "Taxonomies"
+      within_row(1) { page.should have_content("Brand") }
+      within_row(2) { page.should have_content("Categories") }
+    end
+  end
+
+  context "create" do
+    before(:each) do
+      click_link "Taxonomies"
+      click_link "admin_new_taxonomy_link"
+    end
+
+    it "should allow an admin to create a new taxonomy" do
+      page.should have_content("New Taxonomy")
+      fill_in "taxonomy_name", :with => "sports"
+      click_button "Create"
+      page.should have_content("successfully created!")
+    end
+
+    it "should display validation errors" do
+      fill_in "taxonomy_name", :with => ""
+      click_button "Create"
+      page.should have_content("can't be blank")
+    end
+  end
+
+  context "edit" do
+    it "should allow an admin to update an existing taxonomy" do
+      create(:taxonomy)
+      click_link "Taxonomies"
+      within_row(1) { click_icon :edit }
+      fill_in "taxonomy_name", :with => "sports 99"
+      click_button "Update"
+      page.should have_content("successfully updated!")
+      page.should have_content("sports 99")
+    end
+  end
+end