diff --git a/Sanity/CAA-support/Makefile b/Sanity/CAA-support/Makefile
index 04d1bd6..d9e6874 100644
--- a/Sanity/CAA-support/Makefile
+++ b/Sanity/CAA-support/Makefile
@@ -58,4 +58,3 @@ $(METADATA): Makefile
 	@echo "Destructive:     no" >> $(METADATA)
 	@echo "Releases:        -RHEL4 -RHELClient5 -RHELServer5" >> $(METADATA)
 
-	rhts-lint $(METADATA)
diff --git a/Sanity/CAA-support/runtest.sh b/Sanity/CAA-support/runtest.sh
index f23a06e..ef760d0 100755
--- a/Sanity/CAA-support/runtest.sh
+++ b/Sanity/CAA-support/runtest.sh
@@ -26,7 +26,6 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 # Include Beaker environment
-. /usr/bin/rhts-environment.sh || exit 1
 . /usr/share/beakerlib/beakerlib.sh || exit 1
 
 PACKAGE="bind"
diff --git a/Sanity/Master-server-chrooted-reverse-lookup/Makefile b/Sanity/Master-server-chrooted-reverse-lookup/Makefile
index 03ddb41..31b21f1 100644
--- a/Sanity/Master-server-chrooted-reverse-lookup/Makefile
+++ b/Sanity/Master-server-chrooted-reverse-lookup/Makefile
@@ -61,4 +61,3 @@ $(METADATA): Makefile
 	@echo "Destructive:     no" >> $(METADATA)
 	@echo "RhtsRequires: library(bind/bind-setup)" >> $(METADATA)
 
-	rhts-lint $(METADATA)
diff --git a/Sanity/Master-server-chrooted-reverse-lookup/runtest.sh b/Sanity/Master-server-chrooted-reverse-lookup/runtest.sh
index 0392bdc..f06285c 100755
--- a/Sanity/Master-server-chrooted-reverse-lookup/runtest.sh
+++ b/Sanity/Master-server-chrooted-reverse-lookup/runtest.sh
@@ -28,7 +28,6 @@
 
 # Include rhts environment
 #set -x
-. /usr/bin/rhts-environment.sh
 . /usr/lib/beakerlib/beakerlib.sh
 . /usr/share/beakerlib/beakerlib.sh || exit 1
 
diff --git a/Sanity/Master-server-chrooted/Makefile b/Sanity/Master-server-chrooted/Makefile
index 75190e7..04f36e6 100644
--- a/Sanity/Master-server-chrooted/Makefile
+++ b/Sanity/Master-server-chrooted/Makefile
@@ -58,4 +58,3 @@ $(METADATA): Makefile
 	@echo "Destructive:     no" >> $(METADATA)
 	@echo "Releases:        -RHEL4 -RHELClient5 -RHELServer5 -RHEL6" >> $(METADATA)
 
-	rhts-lint $(METADATA)
diff --git a/Sanity/Master-server-chrooted/runtest.sh b/Sanity/Master-server-chrooted/runtest.sh
index 9ab80d2..98867e0 100755
--- a/Sanity/Master-server-chrooted/runtest.sh
+++ b/Sanity/Master-server-chrooted/runtest.sh
@@ -26,7 +26,6 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 # Include Beaker environment
-. /usr/bin/rhts-environment.sh || exit 1
 . /usr/share/beakerlib/beakerlib.sh || exit 1
 
 PACKAGE="bind"
diff --git a/Sanity/Master-server-not-chrooted-reverse-lookup/Makefile b/Sanity/Master-server-not-chrooted-reverse-lookup/Makefile
index 9399ea3..7081b51 100644
--- a/Sanity/Master-server-not-chrooted-reverse-lookup/Makefile
+++ b/Sanity/Master-server-not-chrooted-reverse-lookup/Makefile
@@ -60,4 +60,3 @@ $(METADATA): Makefile
 	@echo "Destructive:     no" >> $(METADATA)
 	@echo "RhtsRequires: library(bind/bind-setup)" >> $(METADATA)
 
-	rhts-lint $(METADATA)
diff --git a/Sanity/Master-server-not-chrooted-reverse-lookup/runtest.sh b/Sanity/Master-server-not-chrooted-reverse-lookup/runtest.sh
index 284f285..736e0fc 100644
--- a/Sanity/Master-server-not-chrooted-reverse-lookup/runtest.sh
+++ b/Sanity/Master-server-not-chrooted-reverse-lookup/runtest.sh
@@ -28,7 +28,6 @@
 
 # Include rhts environment
 #set -x
-. /usr/bin/rhts-environment.sh
 . /usr/lib/beakerlib/beakerlib.sh
 . /usr/share/beakerlib/beakerlib.sh || exit 1
 
diff --git a/Sanity/Master-server-not-chrooted/Makefile b/Sanity/Master-server-not-chrooted/Makefile
index d86e0ba..d5830cf 100644
--- a/Sanity/Master-server-not-chrooted/Makefile
+++ b/Sanity/Master-server-not-chrooted/Makefile
@@ -60,4 +60,3 @@ $(METADATA): Makefile
 	@echo "Destructive:     no" >> $(METADATA)
 	@echo "RhtsRequires: library(bind/bind-setup)" >> $(METADATA)
 
-	rhts-lint $(METADATA)
diff --git a/Sanity/Master-server-not-chrooted/runtest.sh b/Sanity/Master-server-not-chrooted/runtest.sh
index ec62a04..bb254d6 100644
--- a/Sanity/Master-server-not-chrooted/runtest.sh
+++ b/Sanity/Master-server-not-chrooted/runtest.sh
@@ -28,7 +28,6 @@
 
 # Include rhts environment
 #set -x
-. /usr/bin/rhts-environment.sh
 . /usr/lib/beakerlib/beakerlib.sh
 
 # Some heplful functions
diff --git a/Sanity/Run-internal-BIND-test-suite/Makefile b/Sanity/Run-internal-BIND-test-suite/Makefile
index 09c1acb..45ce719 100644
--- a/Sanity/Run-internal-BIND-test-suite/Makefile
+++ b/Sanity/Run-internal-BIND-test-suite/Makefile
@@ -72,4 +72,3 @@ $(METADATA): Makefile
 	@echo "Destructive:     no" >> $(METADATA)
 	@echo "Bug:             642970" >> $(METADATA)
 
-	rhts-lint $(METADATA)
diff --git a/Sanity/Run-internal-BIND-test-suite/runtest.sh b/Sanity/Run-internal-BIND-test-suite/runtest.sh
index 7066344..3e730f2 100755
--- a/Sanity/Run-internal-BIND-test-suite/runtest.sh
+++ b/Sanity/Run-internal-BIND-test-suite/runtest.sh
@@ -27,7 +27,6 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 # Include rhts environment
-. /usr/bin/rhts-environment.sh
 . /usr/lib/beakerlib/beakerlib.sh
 
 PACKAGE="bind"
diff --git a/Sanity/rndc-and-pkcs11/Makefile b/Sanity/rndc-and-pkcs11/Makefile
index 7c2143c..70e1140 100644
--- a/Sanity/rndc-and-pkcs11/Makefile
+++ b/Sanity/rndc-and-pkcs11/Makefile
@@ -59,4 +59,3 @@ $(METADATA): Makefile
 	@echo "Bug:             1501531" >> $(METADATA)
 	@echo "Releases:        -RHEL4 -RHELClient5 -RHELServer5" >> $(METADATA)
 
-	rhts-lint $(METADATA)
diff --git a/Sanity/rndc-and-pkcs11/runtest.sh b/Sanity/rndc-and-pkcs11/runtest.sh
index c21e9d3..3423cb1 100644
--- a/Sanity/rndc-and-pkcs11/runtest.sh
+++ b/Sanity/rndc-and-pkcs11/runtest.sh
@@ -26,7 +26,6 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 # Include Beaker environment
-. /usr/bin/rhts-environment.sh || exit 1
 . /usr/share/beakerlib/beakerlib.sh || exit 1
 
 PACKAGE="bind"
diff --git a/purge-rhts.sh b/purge-rhts.sh
index 8ef711c..79cd495 100644
--- a/purge-rhts.sh
+++ b/purge-rhts.sh
@@ -1,5 +1,6 @@
 #!/bin/sh
+#
+# Remove RHTS dependencies from beakerlib test
 
-/usr/bin/rhts-environment.sh
 find -name Makefile -exec sed -e 's|include /usr/share/rhts/lib/rhts-make.include||' -e 's|rhts-lint $(METADATA)||'  -e 'T' -e 'd' -i '{}' ';'
 find -name runtest.sh -exec sed -e 's|. /usr/bin/rhts-environment.sh||' -e 'T' -e 'd' -i '{}' ';'