diff --git a/Lib/slapdtest/_slapdtest.py b/Lib/slapdtest/_slapdtest.py
index 8dcb713..3684111 100644
--- a/Lib/slapdtest/_slapdtest.py
+++ b/Lib/slapdtest/_slapdtest.py
@@ -461,15 +461,7 @@ def stop(self):
             self._proc.terminate()
             self.wait()
         self._cleanup_rundir()
-        if hasattr(atexit, 'unregister'):
-            # Python 3
-            atexit.unregister(self.stop)
-        elif hasattr(atexit, '_exithandlers'):
-            # Python 2, can be None during process shutdown
-            try:
-                atexit._exithandlers.remove(self.stop)
-            except ValueError:
-                pass
+        atexit.unregister(self.stop)
 
     def restart(self):
         """