diff --git a/lib/neo4j/indexer.rb b/lib/neo4j/indexer.rb
index cac3f7eda..3ea7602fb 100644
--- a/lib/neo4j/indexer.rb
+++ b/lib/neo4j/indexer.rb
@@ -30,10 +30,6 @@ def self.remove_instance(clazz)
       @instances.delete(clazz.root_class) unless @instances.nil?
     end
 
-    # only for testing purpose, e.g we need to redefine an existing class
-    def self.clear_all_instances
-      @instances = nil
-    end
 
     # (Re)index the given node
     # :api: private
diff --git a/test/neo4j/indexer_spec.rb b/test/neo4j/indexer_spec.rb
index 8dba30cd7..f9b3ae546 100644
--- a/test/neo4j/indexer_spec.rb
+++ b/test/neo4j/indexer_spec.rb
@@ -24,12 +24,16 @@ class Company
       has_n(:employees).from(Employee, :employed_by)
     end
 
-    Indexer.clear_all_instances
+#    Indexer.clear_all_instances
     @employee_indexer = Indexer.instance Employee
     @company_indexer = Indexer.instance Company
     @employee_indexer.add_index_in_relationship_on_property(Company, 'employees', 'employed_by', 'salary')
   end
 
+  after(:all) do
+    Indexer.remove_instance Employee
+    Indexer.remove_instance Company
+  end
 
   before(:each) do
     Neo4j::Transaction.new
@@ -105,7 +109,8 @@ class Company
       has_n(:employees).to(Employee)
     end
 
-    Indexer.clear_all_instances
+    Indexer.remove_instance Employee
+    Indexer.remove_instance Company
     @employee_indexer = Indexer.instance Employee
     @company_indexer = Indexer.instance Company
     @employee_indexer.add_index_in_relationship_on_property(Company, 'employees', 'employees', 'salary')
@@ -217,7 +222,7 @@ class Person
   end
 
   def create_indexer
-    Indexer.clear_all_instances
+    Indexer.remove_instance Person
     indexer = Indexer.instance Person
     indexer.add_index_in_relationship_on_property(Person, 'friends', 'friends', 'age')
     indexer
@@ -325,7 +330,6 @@ def create_indexer
   before(:each) do
     @node_class = mock('nodeClass')
     @node_class.should_receive(:root_class).any_number_of_times.and_return("Foo")
-    Indexer.clear_all_instances
     @indexer = Indexer.instance @node_class
     @indexer.add_index_on_property('foo')
   end
diff --git a/test/neo4j/tx_tracker_spec.rb b/test/neo4j/tx_tracker_spec.rb
index de3f752ed..ae74b6c64 100644
--- a/test/neo4j/tx_tracker_spec.rb
+++ b/test/neo4j/tx_tracker_spec.rb
@@ -20,13 +20,13 @@ def to_s
 describe "TxTracker (TxNodeList)" do
 
 
-  before(:all) do
-    Neo4j.start
+  before(:each) do
+    start
     Neo4j.load_tx_tracker
     @tx_node_list = Neo4j::TxNodeList.instance
   end
 
-  after(:all) do
+  after(:each) do
     stop
   end
 
@@ -163,7 +163,6 @@ def to_s
 
 
   it "should undo a complete transaction" do
-    pending "Fails if the RSpecs are running in reverse order - fix it"
     @tx_node_list = Neo4j::TxNodeList.instance
 
     node1 = node2 = node3 = nil