diff --git a/tests/at b/tests/at
new file mode 160000
index 0000000..30cccc8
--- /dev/null
+++ b/tests/at
@@ -0,0 +1 @@
+Subproject commit 30cccc88a2064eb05018a09d65164a26972cd5b5
diff --git a/tests/initscript/Makefile b/tests/initscript/Makefile
index 106ee79..9b15af0 100644
--- a/tests/initscript/Makefile
+++ b/tests/initscript/Makefile
@@ -42,9 +42,6 @@ build: $(BUILT_FILES)
 clean:
 	rm -f *~ $(BUILT_FILES)
 
-
-include /usr/share/rhts/lib/rhts-make.include
-
 $(METADATA): Makefile
 	@echo "Owner:           Radek Biba <rbiba@redhat.com>" > $(METADATA)
 	@echo "Name:            $(TEST)" >> $(METADATA)
diff --git a/tests/initscript/runtest.sh b/tests/initscript/runtest.sh
index b56556d..a84aecb 100755
--- a/tests/initscript/runtest.sh
+++ b/tests/initscript/runtest.sh
@@ -27,7 +27,6 @@
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 # Include rhts environment
-. /usr/bin/rhts-environment.sh
 . /usr/share/rhts-library/rhtslib.sh
 
 PACKAGE="at"
diff --git a/tests/tests.yml b/tests/tests.yml
index 7c14ca2..751a586 100644
--- a/tests/tests.yml
+++ b/tests/tests.yml
@@ -5,6 +5,8 @@
   - role: standard-test-beakerlib
     tags:
     - classic
+    - container
+    - atomic
     tests:
     - initscript
     required_packages: