gistfile1.txt

diff --git a/test/probe/common.py b/test/probe/common.py
index ccc7e63..50bf8e8 100644
--- a/test/probe/common.py
+++ b/test/probe/common.py
@@ -223,16 +223,13 @@ def reset_environment():
                 for server in Manager([server_name]):
                     for i, conf in enumerate(server.conf_files(), 1):
                         config_dict[server.server][i] = conf
-    except BaseException:
+    except AssertionError as e:
+        raise SkipTest(e)
+    finally:
         try:
-            raise
-        except AssertionError as e:
-            raise SkipTest(e)
-        finally:
-            try:
-                kill_servers(port2server, pids)
-            except Exception:
-                pass
+            kill_servers(port2server, pids)
+        except Exception:
+            pass
     return pids, port2server, account_ring, container_ring, object_ring, \
         policy, url, token, account, config_dict
 

oh yeah this would always kill servers - that's not a good idea