diff --git a/CHANGES b/CHANGES
index 4174f6a..004fa57 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,13 +6,16 @@ Changes since 2.4.35:
 Lib/
 * gracefully handle KeyError in LDAPObject._ldap_call() when
   using errno
+* added new stand-alone module slapdtest (formerly Tests/slapd.py)
+  for general use (still experimental)
 
 Tests/
-* re-factored slapd.py, t_cext.py and t_search.py
+* re-factored t_cext.py and t_search.py
 * set env var LDAPNOINIT=1 in t_cext.py and t_search.py to avoid
   interference with locally installed .ldaprc or ldap.conf
 * by default back-mdb is now used for slapd-based tests
-  which requires fairly recent OpenLDAP builds
+  which requires fairly recent OpenLDAP builds but implements
+  full feature set
 * env vars can be set for slapd.py to tweak path names
   of executables, temporary and schema data to be used
 * new class SlapdTestCase
@@ -1393,4 +1396,4 @@ Released 2.0.0pre02 2002-02-01
 ----------------------------------------------------------------
 Released 1.10alpha3 2000-09-19
 
-$Id: CHANGES,v 1.429 2017/04/26 14:54:14 stroeder Exp $
+$Id: CHANGES,v 1.430 2017/04/26 16:52:50 stroeder Exp $
diff --git a/Tests/slapd.py b/Lib/slapdtest.py
similarity index 97%
rename from Tests/slapd.py
rename to Lib/slapdtest.py
index caafac7..aa8573a 100644
--- a/Tests/slapd.py
+++ b/Lib/slapdtest.py
@@ -1,6 +1,12 @@
 """
-Utilities for starting up a test slapd server
-and talking to it with ldapsearch/ldapadd.
+slapdtest - module for spawning test instances of OpenLDAP's slapd server
+
+See http://www.python-ldap.org/ for details.
+
+\$Id: slapdtest.py,v 1.1 2017/04/26 16:52:50 stroeder Exp $
+
+Python compability note:
+This module only works with Python 2.7.x since
 """
 
 import os
diff --git a/Tests/__init__.py b/Tests/__init__.py
index 5367f82..db0f9a6 100644
--- a/Tests/__init__.py
+++ b/Tests/__init__.py
@@ -12,5 +12,3 @@
 import t_ldif 
 import t_search 
 import t_ldap_schema_subentry
-
-import slapd
\ No newline at end of file
diff --git a/Tests/t_cext.py b/Tests/t_cext.py
index f9b28d8..0887738 100644
--- a/Tests/t_cext.py
+++ b/Tests/t_cext.py
@@ -4,7 +4,7 @@
 
 import os
 import unittest
-from Tests.slapd import SlapdTestCase
+from slapdtest import SlapdTestCase
 
 # Switch off processing .ldaprc or ldap.conf before importing _ldap
 os.environ['LDAPNOINIT'] = '1'
diff --git a/Tests/t_search.py b/Tests/t_search.py
index a2a6a99..8922a1d 100644
--- a/Tests/t_search.py
+++ b/Tests/t_search.py
@@ -1,6 +1,6 @@
 import os
 import unittest
-from Tests.slapd import SlapdTestCase
+from slapdtest import SlapdTestCase
 
 # Switch off processing .ldaprc or ldap.conf before importing _ldap
 os.environ['LDAPNOINIT'] = '1'
diff --git a/setup.py b/setup.py
index 5b1241a..7790f27 100644
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@
 
 See http://www.python-ldap.org/ for details.
 
-$Id: setup.py,v 1.78 2017/02/14 21:38:13 stroeder Exp $
+$Id: setup.py,v 1.79 2017/04/26 16:52:50 stroeder Exp $
 """
 
 has_setuptools = False
@@ -149,6 +149,7 @@ class OpenLDAP2:
     'ldif',
     'dsml',
     'ldap',
+    'slapdtest',
     'ldap.async',
     'ldap.controls',
     'ldap.controls.deref',