diff --git a/simgear/io/test_HTTP.hxx b/simgear/io/test_HTTP.hxx
index 257ced06..11b25171 100644
--- a/simgear/io/test_HTTP.hxx
+++ b/simgear/io/test_HTTP.hxx
@@ -235,7 +235,6 @@ public:
         it = std::remove_if(_channels.begin(), _channels.end(), EraseIfClosed());
 
         for (typename std::vector<T*>::iterator it2 = it; it2 != _channels.end(); ++it2) {
-            _poller.removeChannel(*it2);
             delete *it2;
         }
 
diff --git a/simgear/io/test_repository.cxx b/simgear/io/test_repository.cxx
index f7d5cac4..c06830fc 100644
--- a/simgear/io/test_repository.cxx
+++ b/simgear/io/test_repository.cxx
@@ -899,6 +899,9 @@ int main(int argc, char* argv[])
 
     testAbandonCorruptFiles(&cl);
 
+    testServer.disconnectAll();
+    cl.clearAllConnections();
+    
     testPartialUpdateBasic(&cl);
     testPartialUpdateExisting(&cl);
     testPartialUpdateWidenWhileInProgress(&cl);