3 files changed, 6 insertions, 7 deletions
diff --git a/tests/http.test b/tests/http.test
index 4beba00..3049742 100644
--- a/tests/http.test
+++ b/tests/http.test
@@ -12,7 +12,7 @@
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
 #
-# RCS: @(#) $Id: http.test,v 1.33 2003/02/11 20:41:38 kennykb Exp $
+# RCS: @(#) $Id: http.test,v 1.34 2003/06/27 17:22:41 dgp Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest 2
@@ -48,6 +48,7 @@ catch {unset data}
 # Ensure httpd file exists
 
 set origFile [file join $::tcltest::testsDirectory httpd]
+set origFile [file join [pwd] [file dirname [info script]] httpd]
 set httpdFile [file join [temporaryDirectory] httpd_[pid]]
 if {![file exists $httpdFile]} {
     makeFile "" $httpdFile
diff --git a/tests/init.test b/tests/init.test
index db93b60..6855098 100644
--- a/tests/init.test
+++ b/tests/init.test
@@ -10,7 +10,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: init.test,v 1.10 2003/06/26 00:54:21 dgp Exp $
+# RCS: @(#) $Id: init.test,v 1.11 2003/06/27 17:22:41 dgp Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
@@ -67,10 +67,6 @@ interp eval $testInterp [list namespace import -force ::tcltest::*]
 
 interp eval $testInterp {
 
-if {[lsearch [namespace children] ::tcltest] == -1} {
-    package require tcltest
-}
-
 auto_reset
 catch {rename parray {}}
 
@@ -201,6 +197,7 @@ foreach arg [subst -nocommands -novariables {
     incr count
 }
 
+cleanupTests
 }	;#  End of [interp eval $testInterp]
 
 # cleanup
diff --git a/tests/pkg.test b/tests/pkg.test
index 9dd0784..189d2c1 100644
--- a/tests/pkg.test
+++ b/tests/pkg.test
@@ -10,7 +10,7 @@
 # See the file "license.terms" for information on usage and redistribution
 # of this file, and for a DISCLAIMER OF ALL WARRANTIES.
 #
-# RCS: @(#) $Id: pkg.test,v 1.9 2001/08/06 19:13:29 dgp Exp $
+# RCS: @(#) $Id: pkg.test,v 1.10 2003/06/27 17:22:41 dgp Exp $
 
 if {[lsearch [namespace children] ::tcltest] == -1} {
     package require tcltest
@@ -645,6 +645,7 @@ set auto_path $oldPath
 package unknown $oldPkgUnknown
 concat
 
+cleanupTests
 }
 
 # cleanup