8 files changed, 16 insertions, 15 deletions
diff --git a/t/test-protocol-ftp.rb b/t/test-protocol-ftp.rb
index d06b7af..abe5050 100755
--- a/t/test-protocol-ftp.rb
+++ b/t/test-protocol-ftp.rb
@@ -1,8 +1,9 @@
-#!/usr/bin/ruby -I../worker/tests/ -I./worker/tests/
+#!/usr/bin/ruby -I../lib/ -Ilib/
 
 
 require 'test/unit'
-require 'ftp'
+
+require 'custodian/protocol-tests/ftp.rb'
 
 
 
diff --git a/t/test-protocol-http.rb b/t/test-protocol-http.rb
index fb6305b..cc8421c 100755
--- a/t/test-protocol-http.rb
+++ b/t/test-protocol-http.rb
@@ -1,9 +1,10 @@
-#!/usr/bin/ruby -I../worker/tests/ -I./worker/tests/
+#!/usr/bin/ruby -I../lib/ -Ilib/
 
 
 require 'test/unit'
 require 'webrick'
-require 'http'
+require 'custodian/protocol-tests/http.rb'
+
 
 
 
diff --git a/t/test-protocol-https.rb b/t/test-protocol-https.rb
index b996b19..a41f9f3 100755
--- a/t/test-protocol-https.rb
+++ b/t/test-protocol-https.rb
@@ -1,8 +1,8 @@
-#!/usr/bin/ruby -I../worker/tests/ -I./worker/tests/
+#!/usr/bin/ruby -I../lib/ -Ilib/
 
 
 require 'test/unit'
-require 'https'
+require 'custodian/protocol-tests/https.rb'
 
 
 
diff --git a/t/test-protocol-jabber.rb b/t/test-protocol-jabber.rb
index 7d9ac27..50db803 100755
--- a/t/test-protocol-jabber.rb
+++ b/t/test-protocol-jabber.rb
@@ -1,8 +1,8 @@
-#!/usr/bin/ruby -I../worker/tests/ -I./worker/tests/
+#!/usr/bin/ruby -I../lib/ -Ilib/
 
 
 require 'test/unit'
-require 'jabber'
+require 'custodian/protocol-tests/jabber.rb'
 
 
 
diff --git a/t/test-protocol-ldap.rb b/t/test-protocol-ldap.rb
index 2ef2858..b7948ad 100755
--- a/t/test-protocol-ldap.rb
+++ b/t/test-protocol-ldap.rb
@@ -1,8 +1,8 @@
-#!/usr/bin/ruby -I../worker/ -I./worker/
+#!/usr/bin/ruby -I../lib/ -Ilib/
 
 
 require 'test/unit'
-require 'tests/ldap'
+require 'custodian/protocol-tests/ldap.rb'
 
 
 
diff --git a/t/test-protocol-rsync.rb b/t/test-protocol-rsync.rb
index 8dfa7b9..9bafd10 100755
--- a/t/test-protocol-rsync.rb
+++ b/t/test-protocol-rsync.rb
@@ -1,8 +1,8 @@
-#!/usr/bin/ruby -I../worker/tests/ -I./worker/tests/
+#!/usr/bin/ruby -I../lib/ -Ilib/
 
 
 require 'test/unit'
-require 'rsync'
+require 'custodian/protocol-tests/rsync.rb'
 
 
 
diff --git a/t/test-protocol-smtp.rb b/t/test-protocol-smtp.rb
index 01714f8..b456d30 100755
--- a/t/test-protocol-smtp.rb
+++ b/t/test-protocol-smtp.rb
@@ -1,8 +1,8 @@
-#!/usr/bin/ruby -I../worker/tests/ -I./worker/tests/
+#!/usr/bin/ruby -I../lib/ -Ilib/
 
 
 require 'test/unit'
-require 'smtp'
+require 'custodian/protocol-tests/smtp.rb'
 
 
 
diff --git a/t/test-protocol-ssh.rb b/t/test-protocol-ssh.rb
index 2f4f998..259dfb9 100755
--- a/t/test-protocol-ssh.rb
+++ b/t/test-protocol-ssh.rb
@@ -6,7 +6,6 @@ require 'ssh'
 
 
 
-
 #
 # Unit test for the SSH-protocol probe.
 #