diff --git a/spec/_redistat_spec.rb b/spec/_redistat_spec.rb
index b2899a8..5a081c8 100644
--- a/spec/_redistat_spec.rb
+++ b/spec/_redistat_spec.rb
@@ -2,11 +2,11 @@ require "spec_helper"
 
 describe Redistat do
   
-  before(:all) do
+  before(:each) do
     db.flushdb
   end
   
-  it "should have a valid redis client instance" do
+  it "should have a valid Redis client instance" do
     db.should_not be_nil
   end
   
@@ -16,7 +16,7 @@ describe Redistat do
   end
   
   it "should be able to set and get data" do
-    db.set "hello", "world"
+    db.set("hello", "world")
     db.get("hello").should == "world"
     db.del("hello").should be_true
   end
diff --git a/spec/event_spec.rb b/spec/event_spec.rb
index e7368bd..f778fd0 100644
--- a/spec/event_spec.rb
+++ b/spec/event_spec.rb
@@ -2,11 +2,8 @@ require "spec_helper"
 
 describe Redistat::Event do
   
-  before(:all) do
-    db.flushdb
-  end
-  
   before(:each) do
+    db.flushdb
     @scope = "PageViews"
     @label = "about_us"
     @label_hash = Digest::SHA1.hexdigest(@label)
diff --git a/spec/label_spec.rb b/spec/label_spec.rb
index 158d353..27695c7 100644
--- a/spec/label_spec.rb
+++ b/spec/label_spec.rb
@@ -2,11 +2,8 @@ require "spec_helper"
 
 describe Redistat::Label do
   
-  before(:all) do
-    db.flushdb
-  end
-  
   before(:each) do
+    db.flushdb
     @name = "about_us"
     @label = Redistat::Label.new(@name)
   end