diff --git a/pg-ldap-sync.gemspec b/pg-ldap-sync.gemspec
index 0f38315..e7d1901 100644
--- a/pg-ldap-sync.gemspec
+++ b/pg-ldap-sync.gemspec
@@ -27,4 +27,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "minitest", "~> 5.0"
   spec.add_development_dependency "bundler", "~> 1.16"
   spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "minitest-hooks", "~> 1.4"
 end
diff --git a/test/test_pg_ldap_sync.rb b/test/test_pg_ldap_sync.rb
index 8f19e55..90639e4 100644
--- a/test/test_pg_ldap_sync.rb
+++ b/test/test_pg_ldap_sync.rb
@@ -1,10 +1,13 @@
 require "minitest/autorun"
+require 'minitest/hooks/test'
 require "pg_ldap_sync"
 require 'yaml'
 require 'fileutils'
 require_relative 'ldap_server'
 
 class TestPgLdapSync < Minitest::Test
+  include Minitest::Hooks
+
   def log_and_run( *cmd )
     puts cmd.join(' ')
     system( *cmd )
@@ -12,8 +15,7 @@ class TestPgLdapSync < Minitest::Test
   end
 
   def start_ldap_server
-    yaml_fname = File.join(File.dirname(__FILE__), "fixtures/ldapdb.yaml")
-    @directory = File.open(yaml_fname){|f| YAML::load(f.read) }
+    @directory = [{}]
 
     # Listen for incoming LDAP connections. For each one, create a Connection
     # object, which will invoke a HashOperation object for each request.
@@ -26,7 +28,7 @@ class TestPgLdapSync < Minitest::Test
     # :ssl_cert_file    => "cert.pem",
     # :ssl_on_connect   => true,
       :operation_class  => HashOperation,
-      :operation_args   => [@directory]
+      :operation_args   => @directory
     )
     @ldap_server.run_tcpserver
   end
@@ -44,23 +46,29 @@ class TestPgLdapSync < Minitest::Test
       log_and_run 'initdb', '-D', 'temp/pg_data', '--no-locale'
     end
     log_and_run 'pg_ctl', '-w', '-o', "-k.", '-D', 'temp/pg_data', 'start'
-    log_and_run 'psql', '-e', '-c', "DROP ROLE IF EXISTS fred, wilma, \"Flintstones\", \"Wilmas\", \"All Users\"", 'postgres'
   end
 
   def stop_pg_server
     log_and_run 'pg_ctl', '-w', '-o', "-k.", '-D', 'temp/pg_data', 'stop'
   end
 
-  def setup
+  def before_all
+    super
+    ENV['LC_MESSAGES'] = 'C'
     start_ldap_server
     start_pg_server
   end
 
-  def teardown
+  def after_all
+    super
     stop_ldap_server
     stop_pg_server
   end
 
+  def setup
+    log_and_run 'psql', '-e', '-c', "DROP ROLE IF EXISTS fred, wilma, \"Flintstones\", \"Wilmas\", \"All Users\"", 'postgres'
+  end
+
   def psqlre(*args)
     /^\s*#{args[0]}[ |]*#{args[1]}[ |\{"]*#{args[2..-1].join('[", ]+')}["\}\s]*$/
   end
@@ -75,42 +83,60 @@ class TestPgLdapSync < Minitest::Test
     return text
   end
 
-  def test_sanity
-    PgLdapSync::Application.run(%w[-c test/fixtures/config-ldapdb.yaml -vv])
+  def load_ldap_fixture(fname)
+    yaml_fname = File.join(File.dirname(__FILE__), "fixtures/#{fname}.yaml")
+    @directory[0] = File.open(yaml_fname){|f| YAML::load(f.read) }
+  end
 
-    ENV['LC_MESSAGES'] = 'C'
-    psql_du = exec_psql_du
+  def sync_with_config(config="config-ldapdb")
+    PgLdapSync::Application.run(["-c", "test/fixtures/#{config}.yaml", "-vv"])
+  end
+
+  def sync_to_fixture(fixture: "ldapdb", config: "config-ldapdb")
+    load_ldap_fixture(fixture)
+    sync_with_config(config)
+  end
+
+  def sync_change
+    sync_to_fixture
+
+    yield(@directory)
+
+    sync_with_config
+    exec_psql_du
+  end
+
+  def test_base_users_groups_memberships
+    psql_du = sync_change{}
 
     assert_match(psqlre('All Users','Cannot login'), psql_du)
     assert_match(psqlre('Flintstones','Cannot login'), psql_du)
     assert_match(psqlre('Wilmas','Cannot login','All Users'), psql_du)
     assert_match(psqlre('fred','','All Users','Flintstones'), psql_du)
     assert_match(psqlre('wilma','','Flintstones','Wilmas'), psql_du)
+  end
 
-    # revoke membership of 'wilma' to 'Flintstones'
-    @directory['cn=Flintstones,dc=example,dc=com']['member'].pop
+  def test_add_membership
+    psql_du = sync_change do |dir|
+      # add 'Fred' to 'Wilmas'
+      @directory[0]['cn=Wilmas,dc=example,dc=com']['member'] << 'cn=Fred Flintstone,dc=example,dc=com'
+    end
+    assert_match(psqlre('fred','','All Users','Flintstones', 'Wilmas'), psql_du)
+  end
 
-    PgLdapSync::Application.run(%w[-c test/fixtures/config-ldapdb.yaml -vv])
-    psql_du = exec_psql_du
-
-    assert_match(psqlre('All Users','Cannot login'), psql_du)
-    assert_match(psqlre('Flintstones','Cannot login'), psql_du)
-    assert_match(psqlre('Wilmas','Cannot login','All Users'), psql_du)
-    assert_match(psqlre('fred','','All Users','Flintstones'), psql_du)
+  def test_revoke_membership
+    psql_du = sync_change do |dir|
+      # revoke membership of 'wilma' to 'Flintstones'
+      dir[0]['cn=Flintstones,dc=example,dc=com']['member'].pop
+    end
     assert_match(psqlre('wilma','','Wilmas'), psql_du)
+  end
 
-    # rename role 'wilma'
-    @directory['cn=Wilma Flintstone,dc=example,dc=com']['sAMAccountName'] = ['Wilma Flintstone']
-    # re-add 'Wilma' to 'Flintstones'
-    @directory['cn=Flintstones,dc=example,dc=com']['member'] << 'cn=Wilma Flintstone,dc=example,dc=com'
-
-    PgLdapSync::Application.run(%w[-c test/fixtures/config-ldapdb.yaml -vv])
-    psql_du = exec_psql_du
-
-    assert_match(psqlre('All Users','Cannot login'), psql_du)
-    assert_match(psqlre('Flintstones','Cannot login'), psql_du)
-    assert_match(psqlre('Wilmas','Cannot login','All Users'), psql_du)
-    assert_match(psqlre('fred','','All Users','Flintstones'), psql_du)
+  def test_rename_role
+    psql_du = sync_change do |dir|
+      # rename role 'wilma'
+      dir[0]['cn=Wilma Flintstone,dc=example,dc=com']['sAMAccountName'] = ['Wilma Flintstone']
+    end
     refute_match(/wilma/, psql_du)
     assert_match(psqlre('Wilma Flintstone','','Flintstones','Wilmas'), psql_du)
   end