diff --git a/petclinic_spec.rb b/petclinic_spec.rb
index c2000e2fe..79702272a 100644
--- a/petclinic_spec.rb
+++ b/petclinic_spec.rb
@@ -1,6 +1,5 @@
 require 'headless'
 require 'selenium-webdriver'
-require 'minitest/spec'
 require 'minitest/autorun'
 
 describe 'Petlinic' do
@@ -10,7 +9,6 @@ describe 'Petlinic' do
 
     @driver = Selenium::WebDriver.for :firefox
     @driver.navigate.to 'http://tomcat:8080/petclinic'
-    @wait = Selenium::WebDriver::Wait.new(:timeout => 30)
     @driver.manage.timeouts.implicit_wait = 30
   end
 
@@ -19,39 +17,53 @@ describe 'Petlinic' do
   end
 
   describe 'when homepage is available' do
-    it 'I should see page title containing PetClinic' do
-        sleep 3
-        assert @driver.title == "PetClinic :: a Spring Framework demonstration"
+    it 'should show correct page title' do
+      assert @driver.title == 'PetClinic :: a Spring Framework demonstration'
     end
   end
 
-  describe 'when homepage is available' do
-    it 'click the find owners link' do
-        @driver.find_element(:class, "icon-search").click
-        sleep 3
-        h2 = @driver.find_element(:tag_name, "h2")
-        assert h2.text == "Find Owners"
+  describe 'when site is available' do
+    it 'should have Find Owners page' do
+      # click on Find Owners menu item
+      @driver.find_element(:class, 'icon-search').click
+
+      # wait to see Add Owner on the page that opens
+      @driver.find_element(:link_text, 'Add Owner')
+
+      # grab H2 content
+      h2 = @driver.find_element(:tag_name, 'h2').text
+
+      assert h2 == 'Find Owners'
     end
   end
 
-  describe 'when homepage is available' do
-      it 'click the veterinarians link' do
-          @driver.find_element(:class, "icon-th-list").click
-          sleep 3
-          h2 = @driver.find_element(:tag_name, "h2")
-          assert h2.text == "Veterinarians"
-      end
+  describe 'when site is available' do
+    it 'should have Veterinarians page' do
+      # click on Veterinarian menu item
+      @driver.find_element(:class, 'icon-th-list').click
+
+      # wait to see View as XML on the page that opens
+      @driver.find_element(:link_text, 'View as XML')
+
+      # grab H2 content
+      h2 = @driver.find_element(:tag_name, 'h2').text
+
+      assert h2 == 'Veterinarians'
+    end
   end
 
-  describe 'when homepage is available' do
-      it 'search for veterinarian' do
-          @driver.find_element(:class, "icon-th-list").click
-          search_box = @driver.find_element(:id, "vets_filter")
-          textBox = search_box.find_element(:tag_name, "input")
-          textBox.send_keys("Helen Leary")
-          vets = @driver.find_element(:id, "vets").text
-          assert vets.split("\n")[1] == "Helen Leary radiology"
-      end
-  end
+  describe 'when site is available' do
+    it 'should have Search for Veterinarian feature' do
+      # click on Veterinarian menu item
+      @driver.find_element(:class, 'icon-th-list').click
 
+      # type Veterinarian name in search box
+      @driver.find_element(:tag_name, 'input').send_keys('Helen Leary')
+
+      # grab first cell content in filtered results
+      result = @driver.find_element(:css, 'td.sorting_1').text
+
+      assert result == 'Helen Leary'
+    end
+  end
 end