diff --git a/.fmf/version b/.fmf/version
new file mode 100644
index 0000000..d00491f
--- /dev/null
+++ b/.fmf/version
@@ -0,0 +1 @@
+1
diff --git a/Sanity/CAA-support/Makefile b/Sanity/CAA-support/Makefile
new file mode 100644
index 0000000..2e19cd0
--- /dev/null
+++ b/Sanity/CAA-support/Makefile
@@ -0,0 +1,63 @@
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Makefile of /CoreOS/bind/Sanity/CAA-support
+#   Description: sanity testing of CAA support
+#   Author: Petr Sklenar <psklenar@redhat.com>
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Copyright (c) 2016 Red Hat, Inc.
+#
+#   This program is free software: you can redistribute it and/or
+#   modify it under the terms of the GNU General Public License as
+#   published by the Free Software Foundation, either version 2 of
+#   the License, or (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be
+#   useful, but WITHOUT ANY WARRANTY; without even the implied
+#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+#   PURPOSE.  See the GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program. If not, see http://www.gnu.org/licenses/.
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+export TEST=/CoreOS/bind/Sanity/CAA-support
+export TESTVERSION=1.0
+
+BUILT_FILES=
+
+FILES=$(METADATA) runtest.sh Makefile PURPOSE zone.petr.god zone.hi.ho
+
+.PHONY: all install download clean
+
+run: $(FILES) build
+	./runtest.sh
+
+build: $(BUILT_FILES)
+	test -x runtest.sh || chmod a+x runtest.sh
+
+clean:
+	rm -f *~ $(BUILT_FILES)
+
+
+include /usr/share/rhts/lib/rhts-make.include
+
+$(METADATA): Makefile
+	@echo "Owner:           Petr Sklenar <psklenar@redhat.com>" > $(METADATA)
+	@echo "Name:            $(TEST)" >> $(METADATA)
+	@echo "TestVersion:     $(TESTVERSION)" >> $(METADATA)
+	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
+	@echo "Description:     sanity testing of CAA support" >> $(METADATA)
+	@echo "Type:            Sanity" >> $(METADATA)
+	@echo "TestTime:        10m" >> $(METADATA)
+	@echo "RunFor:          bind" >> $(METADATA)
+	@echo "Requires:        bind bind-utils" >> $(METADATA)
+	@echo "Priority:        Normal" >> $(METADATA)
+	@echo "License:         GPLv2+" >> $(METADATA)
+	@echo "Confidential:    no" >> $(METADATA)
+	@echo "Destructive:     no" >> $(METADATA)
+	@echo "Releases:        -RHEL4 -RHELClient5 -RHELServer5" >> $(METADATA)
+
+	rhts-lint $(METADATA)
diff --git a/Sanity/CAA-support/PURPOSE b/Sanity/CAA-support/PURPOSE
new file mode 100644
index 0000000..c420b0b
--- /dev/null
+++ b/Sanity/CAA-support/PURPOSE
@@ -0,0 +1,3 @@
+PURPOSE of /CoreOS/bind/Sanity/CAA-support
+Description: sanity testing of CAA support
+Author: Petr Sklenar <psklenar@redhat.com>
diff --git a/Sanity/CAA-support/main.fmf b/Sanity/CAA-support/main.fmf
new file mode 100644
index 0000000..b106996
--- /dev/null
+++ b/Sanity/CAA-support/main.fmf
@@ -0,0 +1,8 @@
+component: bind
+contact: Petr Sklenar <psklenar@redhat.com>
+description: ''
+duration: 10m
+relevancy: |
+    distro = rhel-4, rhel-5: False
+summary: sanity testing of CAA support
+test: make run
diff --git a/Sanity/CAA-support/runtest.sh b/Sanity/CAA-support/runtest.sh
new file mode 100755
index 0000000..f23a06e
--- /dev/null
+++ b/Sanity/CAA-support/runtest.sh
@@ -0,0 +1,76 @@
+#!/bin/bash
+# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   runtest.sh of /CoreOS/bind/Sanity/CAA-support
+#   Description: sanity testing of CAA support
+#   Author: Petr Sklenar <psklenar@redhat.com>
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Copyright (c) 2016 Red Hat, Inc.
+#
+#   This program is free software: you can redistribute it and/or
+#   modify it under the terms of the GNU General Public License as
+#   published by the Free Software Foundation, either version 2 of
+#   the License, or (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be
+#   useful, but WITHOUT ANY WARRANTY; without even the implied
+#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+#   PURPOSE.  See the GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program. If not, see http://www.gnu.org/licenses/.
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+# Include Beaker environment
+. /usr/bin/rhts-environment.sh || exit 1
+. /usr/share/beakerlib/beakerlib.sh || exit 1
+
+PACKAGE="bind"
+
+rlJournalStart
+    rlPhaseStartSetup
+        rlAssertRpm $PACKAGE
+	rlFileBackup --clean /var/named/zone.petr.god
+	rlFileBackup --clean /var/named/zone.hi.ho
+	rlFileBackup /etc/named.conf
+	cp zone.petr.god /var/named/zone.petr.god
+	cp zone.hi.ho /var/named/zone.hi.ho
+
+	cat <<EOT >> /etc/named.conf
+zone "petr.god." IN {
+        type master;
+        file "/var/named/zone.petr.god";
+};
+
+zone "hi.ho." IN {
+        type master;
+        file "/var/named/zone.hi.ho";
+};
+EOT
+	rlRun "rlServiceStart named"
+    rlPhaseEnd
+
+    rlPhaseStartTest 'petr.god'
+	rlRun "dig +short @127.0.0.1 caa01.petr.god CAA|grep 'policy'"
+	rlRun "dig +short @127.0.0.1 caa02.petr.god CAA|grep 'Unknown'"
+	rlRun "dig +short @127.0.0.1 caa03.petr.god CAA|grep 'tbs'"
+	rlRun "dig +short @127.0.0.1 caa6.petr.god CAA | wc -l | grep 6"
+    rlPhaseEnd
+
+   rlPhaseStartTest 'hi.ho'
+	rlRun "dig +short @127.0.0.1 caa.hi.ho CAA | grep issue"
+	rlRun "dig +short @127.0.0.1 caa1.hi.ho CAA | grep 'mailto:security at example.com'"
+	rlRun "dig +short @127.0.0.1 caa2.hi.ho CAA| grep 'http://iodef.example.com/'"
+	
+   rlPhaseEnd
+
+    rlPhaseStartCleanup
+	rlFileRestore
+	rlServiceRestore named
+    rlPhaseEnd
+rlJournalPrintText
+rlJournalEnd
diff --git a/Sanity/CAA-support/zone.hi.ho b/Sanity/CAA-support/zone.hi.ho
new file mode 100644
index 0000000..b7f1c7e
--- /dev/null
+++ b/Sanity/CAA-support/zone.hi.ho
@@ -0,0 +1,24 @@
+$ORIGIN hi.ho.
+@  1D  IN  SOA ns1.hi.ho. hostmaster.hi.ho. (
+  2009040114 ; serial
+  3H ; refresh
+  15 ; retry
+  1w ; expire
+  3h ; minimum
+ )
+                IN      NS      ns1.hi.ho.
+                IN      A       1.1.1.1
+ns1             IN      A       1.2.3.4
+a               IN      A       2.2.2.2
+aaaa            IN      AAAA    3FFE:0B80:0444:0004:0000:0000:0000:0004
+caa             IN      CAA     0 issue "ca.example.net"
+caa1            IN     CAA     0 iodef "mailto:security at example.com"
+caa2            IN     CAA     0 iodef "http://iodef.example.com/"
+caa6       CAA 0 policy "policy"
+caa6       CAA 128 path "path"
+caa6       CAA 128 issuewild "issuewild"
+caa6       CAA 128 iodef "iodef"
+caa6       CAA 128 tbs "tbs"
+caa6       CAA 128 auth "auth"
+caa6       CAA 128 aut "auth"
+
diff --git a/Sanity/CAA-support/zone.petr.god b/Sanity/CAA-support/zone.petr.god
new file mode 100644
index 0000000..0351346
--- /dev/null
+++ b/Sanity/CAA-support/zone.petr.god
@@ -0,0 +1,23 @@
+$ORIGIN petr.god.
+@  1D  IN  SOA ns1.petr.god. hostmaster.petr.god. (
+  2002022401 ; serial
+  3H ; refresh
+  15 ; retry
+  1w ; expire
+  3h ; minimum
+ )
+   IN  NS     ns1.petr.god. ; in the domain
+
+ns1    IN A      192.168.122.178     
+www    IN A      192.168.122.123
+ftp    IN CNAME  www.petr.god.
+
+caa01		3600	IN	CAA	0 issue "ca.petr.god\; policy=ev"
+caa02		3600	IN	CAA	128 tbs "Unknown"
+caa03		3600	IN	CAA	128 tbs ""
+caa6       CAA 0 policy "policy"
+caa6       CAA 128 path "path"
+caa6       CAA 128 issuewild "issuewild"
+caa6       CAA 128 iodef "iodef"
+caa6       CAA 128 tbs "tbs"
+caa6       CAA 128 auth "auth"
diff --git a/Sanity/Master-server-chrooted-reverse-lookup/Makefile b/Sanity/Master-server-chrooted-reverse-lookup/Makefile
new file mode 100644
index 0000000..f82a467
--- /dev/null
+++ b/Sanity/Master-server-chrooted-reverse-lookup/Makefile
@@ -0,0 +1,66 @@
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Makefile of /CoreOS/bind/Sanity/Master-server-chrooted-reverse-lookup
+#   Description: Set up master nameserver, test it.
+#   Author: Martin Cermak <mcermak@redhat.com>
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Copyright (c) 2009 Red Hat, Inc. All rights reserved.
+#
+#   This copyrighted material is made available to anyone wishing
+#   to use, modify, copy, or redistribute it subject to the terms
+#   and conditions of the GNU General Public License version 2.
+#
+#   This program is distributed in the hope that it will be
+#   useful, but WITHOUT ANY WARRANTY; without even the implied
+#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+#   PURPOSE. See the GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public
+#   License along with this program; if not, write to the Free
+#   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+#   Boston, MA 02110-1301, USA.
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+export TEST=/CoreOS/bind/Sanity/Master-server-chrooted-reverse-lookup
+export TESTVERSION=1.0
+
+BUILT_FILES=
+
+FILES=$(METADATA) runtest.sh Makefile PURPOSE named.conf zonefile 
+
+.PHONY: all install download clean
+
+run: $(FILES) build
+	./runtest.sh
+
+build: $(BUILT_FILES)
+	chmod a+x runtest.sh
+
+clean:
+	rm -f *~ $(BUILT_FILES)
+
+
+include /usr/share/rhts/lib/rhts-make.include
+
+$(METADATA): Makefile
+	@echo "Owner:           Martin Cermak <mcermak@redhat.com>" > $(METADATA)
+	@echo "Name:            $(TEST)" >> $(METADATA)
+	@echo "TestVersion:     $(TESTVERSION)" >> $(METADATA)
+	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
+	@echo "Description:     Set up master nameserver in chrooted env, test it." >> $(METADATA)
+	@echo "Type:            Sanity" >> $(METADATA)
+	@echo "TestTime:        5m" >> $(METADATA)
+	@echo "RunFor:          bind" >> $(METADATA)
+	@echo "Requires:        bind" >> $(METADATA)
+	@echo "Requires:        bind-chroot" >> $(METADATA)
+	@echo "Requires:        bind-utils" >> $(METADATA)
+	@echo "Priority:        Normal" >> $(METADATA)
+	@echo "License:         GPLv2" >> $(METADATA)
+	@echo "Confidential:    no" >> $(METADATA)
+	@echo "Destructive:     no" >> $(METADATA)
+	@echo "RhtsRequires: library(bind/bind-setup)" >> $(METADATA)
+
+	rhts-lint $(METADATA)
diff --git a/Sanity/Master-server-chrooted-reverse-lookup/PURPOSE b/Sanity/Master-server-chrooted-reverse-lookup/PURPOSE
new file mode 100644
index 0000000..93ce33a
--- /dev/null
+++ b/Sanity/Master-server-chrooted-reverse-lookup/PURPOSE
@@ -0,0 +1,6 @@
+PURPOSE of /CoreOS/bind/Sanity/Master-server-chrooted-reverse-lookup
+Description: Set up master nameserver, run some reverse queries
+             This is a very basic sanity test for bind9.
+             The main purpose for me was to learn how
+             bind works :-)
+Author: Martin Cermak <mcermak@redhat.com>
diff --git a/Sanity/Master-server-chrooted-reverse-lookup/main.fmf b/Sanity/Master-server-chrooted-reverse-lookup/main.fmf
new file mode 100644
index 0000000..1f32fee
--- /dev/null
+++ b/Sanity/Master-server-chrooted-reverse-lookup/main.fmf
@@ -0,0 +1,12 @@
+component: bind
+contact: Petr Sklenar <psklenar@redhat.com>
+description: |4
+                 This is a very basic sanity test for bind9.
+                 The main purpose for me was to learn how
+                 bind works :-)
+    Author: Martin Cermak <mcermak@redhat.com>
+duration: 5m
+relevancy: |
+    distro > rhel-6 && product != rhscl: False
+summary: Set up master nameserver in chrooted env, test it.
+test: make run
diff --git a/Sanity/Master-server-chrooted-reverse-lookup/named.conf b/Sanity/Master-server-chrooted-reverse-lookup/named.conf
new file mode 100644
index 0000000..84eea24
--- /dev/null
+++ b/Sanity/Master-server-chrooted-reverse-lookup/named.conf
@@ -0,0 +1,11 @@
+options {
+        directory       "/var/named";
+        allow-query     { any; };
+};
+
+zone "1.0.10.in-addr.arpa" IN {
+  type master;
+  file "<DOMAIN>.rr.zone";
+  allow-update { none; };
+};
+
diff --git a/Sanity/Master-server-chrooted-reverse-lookup/runtest.sh b/Sanity/Master-server-chrooted-reverse-lookup/runtest.sh
new file mode 100755
index 0000000..0392bdc
--- /dev/null
+++ b/Sanity/Master-server-chrooted-reverse-lookup/runtest.sh
@@ -0,0 +1,99 @@
+#!/bin/bash
+# vim: dict=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   runtest.sh of /CoreOS/bind/Sanity/Master-server-chrooted-reverse-lookup
+#   Description: Set up master nameserver, test it.
+#   Author: Martin Cermak <mcermak@redhat.com>
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Copyright (c) 2009 Red Hat, Inc. All rights reserved.
+#
+#   This copyrighted material is made available to anyone wishing
+#   to use, modify, copy, or redistribute it subject to the terms
+#   and conditions of the GNU General Public License version 2.
+#
+#   This program is distributed in the hope that it will be
+#   useful, but WITHOUT ANY WARRANTY; without even the implied
+#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+#   PURPOSE. See the GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public
+#   License along with this program; if not, write to the Free
+#   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+#   Boston, MA 02110-1301, USA.
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+# Include rhts environment
+#set -x
+. /usr/bin/rhts-environment.sh
+. /usr/lib/beakerlib/beakerlib.sh
+. /usr/share/beakerlib/beakerlib.sh || exit 1
+
+# Some heplful functions
+randomString () {
+    TEMPSTR=`date +%c%N | md5sum | awk '{print $1}'`
+    echo ${TEMPSTR:0:8}
+    unset TEMPSTR
+}
+
+randomNo () {
+    echo $[ $RANDOM / 256 + 1 ]
+}
+
+randomSerial () {
+    date +%N
+}
+
+# Variable declarations
+SERIAL=`randomSerial`
+NO1=`randomNo`
+NO2=`randomNo`
+NO3=`randomNo`
+ORIGPWD=`pwd`
+
+# The test
+rlJournalStart
+    rlPhaseStartSetup
+        rlRun "TmpDir=\`mktemp -d\`" 0 "Creating tmp directory"
+        rlRun "pushd $TmpDir"
+
+        rlRun "rlImport bind/bind-setup"
+        #rlRun "wget --quiet http://nest.test.redhat.com/mnt/qa/scratch/mcermak/bind-setup.tar.gz && tar xvzf bind-setup.tar.gz > /dev/null && . bind-setup/bind-setup.sh" 0 "Imported bind-setup functions."
+
+        bsBindSetupStart "$ORIGPWD/named.conf" "on"
+
+        rlRun "TDOMAIN=`randomString`.cz"
+        rlRun "TZONEFILE=$ROOTDIR/var/named/$TDOMAIN.rr.zone"
+        rlRun "sed -i \"s/<DOMAIN>/$TDOMAIN/g\" /etc/named.conf"
+
+        # zonefile
+        rlRun "cp $ORIGPWD/zonefile $TZONEFILE"
+        rlRun "chmod a+r $TZONEFILE"
+        rlRun "sed -i \"s/<DOMAIN>/$TDOMAIN/g\" $TZONEFILE"
+        rlRun "sed -i \"s/<SERIAL>/$SERIAL/g\" $TZONEFILE"
+        rlRun "sed -i \"s/<NO1>/$NO1/g\" $TZONEFILE"
+        rlRun "sed -i \"s/<NO2>/$NO2/g\" $TZONEFILE"
+        rlRun "sed -i \"s/<NO3>/$NO3/g\" $TZONEFILE"
+        if rlIsRHEL 5; then
+          rlRun "cp /etc/named.conf $ROOTDIR/etc/named.conf"
+        fi
+        bsBindSetupDone chroot
+    rlPhaseEnd
+
+    rlPhaseStartTest
+        # perform tests
+        rlRun "dig @localhost -x 10.0.1.$NO1 +short | grep \"^alice.$TDOMAIN.$\""
+        rlRun "dig @localhost -x 10.0.1.$NO2 +short | grep \"^betty.$TDOMAIN.$\""
+        rlRun "dig @localhost -x 10.0.1.$NO3 +short | grep \"^charlie.$TDOMAIN.$\""
+    rlPhaseEnd
+
+    rlPhaseStartCleanup
+        bsBindSetupCleanup chroot
+        rlRun "popd"
+        rlRun "rm -r $TmpDir" 0 "Removing tmp directory"
+        rlRun "rm -rf $TZONEFILE"
+    rlPhaseEnd
+rlJournalEnd
diff --git a/Sanity/Master-server-chrooted-reverse-lookup/zonefile b/Sanity/Master-server-chrooted-reverse-lookup/zonefile
new file mode 100644
index 0000000..c2c642f
--- /dev/null
+++ b/Sanity/Master-server-chrooted-reverse-lookup/zonefile
@@ -0,0 +1,16 @@
+$ORIGIN 1.0.10.in-addr.arpa.
+$TTL 86400
+@     IN     SOA    dns1.<DOMAIN>.     hostmaster.<DOMAIN>. (
+                    <SERIAL>   ; serial
+                    21600      ; refresh after 6 hours
+                    3600       ; retry after 1 hour
+                    604800     ; expire after 1 week
+                    86400 )    ; minimum TTL of 1 day
+
+      IN     NS     dns1.<DOMAIN>.
+      IN     NS     dns2.<DOMAIN>.
+
+<NO1> IN     PTR    alice.<DOMAIN>.
+<NO2> IN     PTR    betty.<DOMAIN>.
+<NO3> IN     PTR    charlie.<DOMAIN>.
+
diff --git a/Sanity/Master-server-chrooted/Makefile b/Sanity/Master-server-chrooted/Makefile
new file mode 100644
index 0000000..257c238
--- /dev/null
+++ b/Sanity/Master-server-chrooted/Makefile
@@ -0,0 +1,63 @@
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Makefile of /CoreOS/tests/Sanity/Master-server-chrooted
+#   Description: Run basic empty named service and try to resolve localhost on it
+#   Author: Petr Mensik <pemensik@redhat.com>
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Copyright (c) 2018 Red Hat, Inc.
+#
+#   This program is free software: you can redistribute it and/or
+#   modify it under the terms of the GNU General Public License as
+#   published by the Free Software Foundation, either version 2 of
+#   the License, or (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be
+#   useful, but WITHOUT ANY WARRANTY; without even the implied
+#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+#   PURPOSE.  See the GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program. If not, see http://www.gnu.org/licenses/.
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+export TEST=/CoreOS/tests/Sanity/Master-server-chrooted
+export TESTVERSION=1.0
+
+BUILT_FILES=
+
+FILES=$(METADATA) runtest.sh Makefile PURPOSE
+
+.PHONY: all install download clean
+
+run: $(FILES) build
+	./runtest.sh
+
+build: $(BUILT_FILES)
+	test -x runtest.sh || chmod a+x runtest.sh
+
+clean:
+	rm -f *~ $(BUILT_FILES)
+
+
+include /usr/share/rhts/lib/rhts-make.include
+
+$(METADATA): Makefile
+	@echo "Owner:           Petr Mensik <pemensik@redhat.com>" > $(METADATA)
+	@echo "Name:            $(TEST)" >> $(METADATA)
+	@echo "TestVersion:     $(TESTVERSION)" >> $(METADATA)
+	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
+	@echo "Description:     Run basic empty named-chroot service and try to resolve localhost on it" >> $(METADATA)
+	@echo "Type:            Sanity" >> $(METADATA)
+	@echo "TestTime:        5m" >> $(METADATA)
+	@echo "RunFor:          bind" >> $(METADATA)
+	@echo "Requires:        bind bind-utils bind-chroot bind-sdb-chroot" >> $(METADATA)
+	@echo "Priority:        Normal" >> $(METADATA)
+	@echo "License:         GPLv2+" >> $(METADATA)
+	@echo "Confidential:    no" >> $(METADATA)
+	@echo "Destructive:     no" >> $(METADATA)
+	@echo "Releases:        -RHEL4 -RHELClient5 -RHELServer5 -RHEL6" >> $(METADATA)
+
+	rhts-lint $(METADATA)
diff --git a/Sanity/Master-server-chrooted/PURPOSE b/Sanity/Master-server-chrooted/PURPOSE
new file mode 100644
index 0000000..1d01992
--- /dev/null
+++ b/Sanity/Master-server-chrooted/PURPOSE
@@ -0,0 +1,3 @@
+PURPOSE of /CoreOS/tests/Sanity/Master-server-chrooted
+Description: Run basic empty named-chroot service and try to resolve localhost on it
+Author: Petr Mensik <pemensik@redhat.com>
diff --git a/Sanity/Master-server-chrooted/main.fmf b/Sanity/Master-server-chrooted/main.fmf
new file mode 100644
index 0000000..ee43256
--- /dev/null
+++ b/Sanity/Master-server-chrooted/main.fmf
@@ -0,0 +1,12 @@
+component: bind
+contact: Petr Sklenar <psklenar@redhat.com>
+description: |4
+                 This is a very basic sanity test for bind9.
+                 The main purpose for me was to learn how
+                 bind works :-)
+    Author: Martin Cermak <mcermak@redhat.com>
+duration: 25m
+relevancy: |
+    distro > rhel-6 && product != rhscl: False
+summary: Set up master nameserver in chrooted env, test it.
+test: make run
diff --git a/Sanity/Master-server-chrooted/named.conf b/Sanity/Master-server-chrooted/named.conf
new file mode 100644
index 0000000..e477af9
--- /dev/null
+++ b/Sanity/Master-server-chrooted/named.conf
@@ -0,0 +1,11 @@
+options {
+        directory       "/var/named";
+        allow-query     { any; };
+};
+
+zone "<DOMAIN>" IN {
+  type master;
+  file "<DOMAIN>.zone";
+  allow-update { none; };
+};
+
diff --git a/Sanity/Master-server-chrooted/runtest.sh b/Sanity/Master-server-chrooted/runtest.sh
new file mode 100755
index 0000000..9ab80d2
--- /dev/null
+++ b/Sanity/Master-server-chrooted/runtest.sh
@@ -0,0 +1,70 @@
+#!/bin/bash
+# vim: dict+=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   runtest.sh of /CoreOS/tests/Sanity/Master-server-chrooted
+#   Description: Run basic empty named-chroot service and try to resolve localhost on it
+#   Author: Petr Mensik <pemensik@redhat.com>
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Copyright (c) 2018 Red Hat, Inc.
+#
+#   This program is free software: you can redistribute it and/or
+#   modify it under the terms of the GNU General Public License as
+#   published by the Free Software Foundation, either version 2 of
+#   the License, or (at your option) any later version.
+#
+#   This program is distributed in the hope that it will be
+#   useful, but WITHOUT ANY WARRANTY; without even the implied
+#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+#   PURPOSE.  See the GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public License
+#   along with this program. If not, see http://www.gnu.org/licenses/.
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+# Include Beaker environment
+. /usr/bin/rhts-environment.sh || exit 1
+. /usr/share/beakerlib/beakerlib.sh || exit 1
+
+PACKAGE="bind"
+
+test_service()
+{
+    local SERVICE="$1"
+	rlRun "rlServiceStart $SERVICE"
+	rlRun "dig @localhost localhost | grep '^localhost'"
+	rlRun "dig @localhost -x 127.0.0.1 | grep 'PTR[[:space:]]\+localhost.$'" 0 "Reverse address works"
+	rlRun "rlServiceRestore $SERVICE"
+}
+
+rlJournalStart
+    rlPhaseStartSetup
+        rlAssertRpm bind
+	rlAssertRpm bind-utils
+	rlAssertRpm bind-chroot
+    rlPhaseEnd
+
+    rlPhaseStartTest "Testing named"
+    	test_service named
+    rlPhaseEnd
+
+    rlPhaseStartTest "Testing named-chroot"
+    	test_service named-chroot
+    rlPhaseEnd
+
+    rlPhaseStartTest "Testing named-sdb-chroot"
+	    if rpm -q bind-sdb-chroot; then
+		test_service named-sdb-chroot
+	    else
+		rlLog "bind-sdb-chroot not installed, skipping it"
+	    fi
+    rlPhaseEnd
+
+    rlPhaseStartCleanup
+	# noop
+    rlPhaseEnd
+rlJournalPrintText
+rlJournalEnd
diff --git a/Sanity/Master-server-chrooted/zonefile b/Sanity/Master-server-chrooted/zonefile
new file mode 100644
index 0000000..198991e
--- /dev/null
+++ b/Sanity/Master-server-chrooted/zonefile
@@ -0,0 +1,27 @@
+$ORIGIN <DOMAIN>.
+$TTL 86400
+@     IN     SOA    dns1.<DOMAIN>.  hostmaster.<DOMAIN>. (
+                    <SERIAL>  ; serial
+                    21600      ; refresh after 6 hours
+                    3600       ; retry after 1 hour
+                    604800     ; expire after 1 week
+                    86400 )    ; minimum TTL of 1 day
+
+      IN     NS     dns1.<DOMAIN>.
+      IN     NS     dns2.<DOMAIN>.
+
+      IN     MX     10     mail.<DOMAIN>.
+      IN     MX     20     mail2.<DOMAIN>.
+
+             IN     A       <IP1>
+
+server1      IN     A       <IP2>
+server2      IN     A       <IP3>
+dns1         IN     A       <IP4>
+dns2         IN     A       <IP5>
+
+ftp          IN     CNAME   server1
+mail         IN     CNAME   server1
+mail2        IN     CNAME   server2
+www          IN     CNAME   server2
+
diff --git a/Sanity/Master-server-not-chrooted-reverse-lookup/Makefile b/Sanity/Master-server-not-chrooted-reverse-lookup/Makefile
new file mode 100644
index 0000000..ccddd20
--- /dev/null
+++ b/Sanity/Master-server-not-chrooted-reverse-lookup/Makefile
@@ -0,0 +1,65 @@
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Makefile of /CoreOS/bind/Sanity/Master-server-not-chrooted-reverse-lookup
+#   Description: Set up master nameserver, test it.
+#   Author: Martin Cermak <mcermak@redhat.com>
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Copyright (c) 2009 Red Hat, Inc. All rights reserved.
+#
+#   This copyrighted material is made available to anyone wishing
+#   to use, modify, copy, or redistribute it subject to the terms
+#   and conditions of the GNU General Public License version 2.
+#
+#   This program is distributed in the hope that it will be
+#   useful, but WITHOUT ANY WARRANTY; without even the implied
+#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+#   PURPOSE. See the GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public
+#   License along with this program; if not, write to the Free
+#   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+#   Boston, MA 02110-1301, USA.
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+export TEST=/CoreOS/bind/Sanity/Master-server-not-chrooted-reverse-lookup
+export TESTVERSION=1.0
+
+BUILT_FILES=
+
+FILES=$(METADATA) runtest.sh Makefile PURPOSE named.conf zonefile 
+
+.PHONY: all install download clean
+
+run: $(FILES) build
+	./runtest.sh
+
+build: $(BUILT_FILES)
+	chmod a+x runtest.sh
+
+clean:
+	rm -f *~ $(BUILT_FILES)
+
+
+include /usr/share/rhts/lib/rhts-make.include
+
+$(METADATA): Makefile
+	@echo "Owner:           Martin Cermak <mcermak@redhat.com>" > $(METADATA)
+	@echo "Name:            $(TEST)" >> $(METADATA)
+	@echo "TestVersion:     $(TESTVERSION)" >> $(METADATA)
+	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
+	@echo "Description:     Set up master nameserver, test it." >> $(METADATA)
+	@echo "Type:            Sanity" >> $(METADATA)
+	@echo "TestTime:        150m" >> $(METADATA)
+	@echo "RunFor:          bind" >> $(METADATA)
+	@echo "Requires:        bind bind-chroot redhat-lsb" >> $(METADATA)
+	@echo "Requires:        bind-utils" >> $(METADATA)
+	@echo "Priority:        Normal" >> $(METADATA)
+	@echo "License:         GPLv2" >> $(METADATA)
+	@echo "Confidential:    no" >> $(METADATA)
+	@echo "Destructive:     no" >> $(METADATA)
+	@echo "RhtsRequires: library(bind/bind-setup)" >> $(METADATA)
+
+	rhts-lint $(METADATA)
diff --git a/Sanity/Master-server-not-chrooted-reverse-lookup/PURPOSE b/Sanity/Master-server-not-chrooted-reverse-lookup/PURPOSE
new file mode 100644
index 0000000..e4d3062
--- /dev/null
+++ b/Sanity/Master-server-not-chrooted-reverse-lookup/PURPOSE
@@ -0,0 +1,6 @@
+PURPOSE of /CoreOS/bind/Sanity/Master-server-not-chrooted-reverse-lookup
+Description: Set up master nameserver, run some reverse queries
+             This is a very basic sanity test for bind9.
+             The main purpose for me was to learn how
+             bind works :-)
+Author: Martin Cermak <mcermak@redhat.com>
diff --git a/Sanity/Master-server-not-chrooted-reverse-lookup/main.fmf b/Sanity/Master-server-not-chrooted-reverse-lookup/main.fmf
new file mode 100644
index 0000000..90a8ad5
--- /dev/null
+++ b/Sanity/Master-server-not-chrooted-reverse-lookup/main.fmf
@@ -0,0 +1,11 @@
+component: bind
+contact: Petr Sklenar <psklenar@redhat.com>
+description: |4
+                 This is a very basic sanity test for bind9.
+                 The main purpose for me was to learn how
+                 bind works :-)
+    Author: Martin Cermak <mcermak@redhat.com>
+duration: 150m
+relevancy: ''
+summary: Set up master nameserver, test it.
+test: make run
diff --git a/Sanity/Master-server-not-chrooted-reverse-lookup/named.conf b/Sanity/Master-server-not-chrooted-reverse-lookup/named.conf
new file mode 100644
index 0000000..84eea24
--- /dev/null
+++ b/Sanity/Master-server-not-chrooted-reverse-lookup/named.conf
@@ -0,0 +1,11 @@
+options {
+        directory       "/var/named";
+        allow-query     { any; };
+};
+
+zone "1.0.10.in-addr.arpa" IN {
+  type master;
+  file "<DOMAIN>.rr.zone";
+  allow-update { none; };
+};
+
diff --git a/Sanity/Master-server-not-chrooted-reverse-lookup/runtest.sh b/Sanity/Master-server-not-chrooted-reverse-lookup/runtest.sh
new file mode 100644
index 0000000..284f285
--- /dev/null
+++ b/Sanity/Master-server-not-chrooted-reverse-lookup/runtest.sh
@@ -0,0 +1,97 @@
+#!/bin/bash
+# vim: dict=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   runtest.sh of /CoreOS/bind/Sanity/Master-server-not-chrooted-reverse-lookup
+#   Description: Set up master nameserver, test it.
+#   Author: Martin Cermak <mcermak@redhat.com>
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Copyright (c) 2009 Red Hat, Inc. All rights reserved.
+#
+#   This copyrighted material is made available to anyone wishing
+#   to use, modify, copy, or redistribute it subject to the terms
+#   and conditions of the GNU General Public License version 2.
+#
+#   This program is distributed in the hope that it will be
+#   useful, but WITHOUT ANY WARRANTY; without even the implied
+#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+#   PURPOSE. See the GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public
+#   License along with this program; if not, write to the Free
+#   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+#   Boston, MA 02110-1301, USA.
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+# Include rhts environment
+#set -x
+. /usr/bin/rhts-environment.sh
+. /usr/lib/beakerlib/beakerlib.sh
+. /usr/share/beakerlib/beakerlib.sh || exit 1
+
+# Some heplful functions
+randomString () {
+    TEMPSTR=`date +%c%N | md5sum | awk '{print $1}'`
+    echo ${TEMPSTR:0:8}
+    unset TEMPSTR
+}
+
+randomNo () {
+    echo $[ $RANDOM / 256 + 1 ]
+}
+
+randomSerial () {
+    date +%N
+}
+
+# Variable declarations
+SERIAL=`randomSerial`
+NO1=`randomNo`
+NO2=`randomNo`
+NO3=`randomNo`
+ORIGPWD=`pwd`
+
+# The test
+rlJournalStart
+    rlPhaseStartSetup
+        rlRun "TmpDir=\`mktemp -d\`" 0 "Creating tmp directory"
+        rlRun "pushd $TmpDir"
+
+        rlRun "rlImport bind/bind-setup"
+        #rlRun "wget --quiet http://nest.test.redhat.com/mnt/qa/scratch/mcermak/bind-setup.tar.gz && tar xvzf bind-setup.tar.gz > /dev/null && . bind-setup/bind-setup.sh" 0 "Imported bind-setup functions."
+
+        bsBindSetupStart "$ORIGPWD/named.conf" "off"
+
+        rlRun "TDOMAIN=`randomString`.cz"
+        rlRun "TZONEFILE=$ROOTDIR/var/named/$TDOMAIN.rr.zone"
+        rlRun "sed -i \"s/<DOMAIN>/$TDOMAIN/g\" /etc/named.conf"
+
+        # zonefile
+        rlRun "cp $ORIGPWD/zonefile $TZONEFILE"
+        rlRun "chmod a+r $TZONEFILE"
+        rlRun "sed -i \"s/<DOMAIN>/$TDOMAIN/g\" $TZONEFILE"
+        rlRun "sed -i \"s/<SERIAL>/$SERIAL/g\" $TZONEFILE"
+        rlRun "sed -i \"s/<NO1>/$NO1/g\" $TZONEFILE"
+        rlRun "sed -i \"s/<NO2>/$NO2/g\" $TZONEFILE"
+        rlRun "sed -i \"s/<NO3>/$NO3/g\" $TZONEFILE"
+
+        bsBindSetupDone
+    rlPhaseEnd
+
+    rlPhaseStartTest
+        # perform tests
+        rlRun "dig @localhost -x 10.0.1.$NO1 +short | grep \"^alice.$TDOMAIN.$\""
+        rlRun "dig @localhost -x 10.0.1.$NO2 +short | grep \"^betty.$TDOMAIN.$\""
+        rlRun "dig @localhost -x 10.0.1.$NO3 +short | grep \"^charlie.$TDOMAIN.$\""
+    rlPhaseEnd
+
+    rlPhaseStartCleanup
+        bsBindSetupCleanup
+        rlRun "popd"
+        rlRun "rm -r $TmpDir" 0 "Removing tmp directory"
+        rlRun "rm -rf $TZONEFILE"
+    rlPhaseEnd
+rlJournalEnd
diff --git a/Sanity/Master-server-not-chrooted-reverse-lookup/zonefile b/Sanity/Master-server-not-chrooted-reverse-lookup/zonefile
new file mode 100644
index 0000000..c2c642f
--- /dev/null
+++ b/Sanity/Master-server-not-chrooted-reverse-lookup/zonefile
@@ -0,0 +1,16 @@
+$ORIGIN 1.0.10.in-addr.arpa.
+$TTL 86400
+@     IN     SOA    dns1.<DOMAIN>.     hostmaster.<DOMAIN>. (
+                    <SERIAL>   ; serial
+                    21600      ; refresh after 6 hours
+                    3600       ; retry after 1 hour
+                    604800     ; expire after 1 week
+                    86400 )    ; minimum TTL of 1 day
+
+      IN     NS     dns1.<DOMAIN>.
+      IN     NS     dns2.<DOMAIN>.
+
+<NO1> IN     PTR    alice.<DOMAIN>.
+<NO2> IN     PTR    betty.<DOMAIN>.
+<NO3> IN     PTR    charlie.<DOMAIN>.
+
diff --git a/Sanity/Master-server-not-chrooted/Makefile b/Sanity/Master-server-not-chrooted/Makefile
new file mode 100644
index 0000000..891a9a3
--- /dev/null
+++ b/Sanity/Master-server-not-chrooted/Makefile
@@ -0,0 +1,65 @@
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Makefile of /CoreOS/bind/Sanity/Master-server-not-chrooted
+#   Description: Set up master nameserver, test it.
+#   Author: Martin Cermak <mcermak@redhat.com>
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Copyright (c) 2009 Red Hat, Inc. All rights reserved.
+#
+#   This copyrighted material is made available to anyone wishing
+#   to use, modify, copy, or redistribute it subject to the terms
+#   and conditions of the GNU General Public License version 2.
+#
+#   This program is distributed in the hope that it will be
+#   useful, but WITHOUT ANY WARRANTY; without even the implied
+#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+#   PURPOSE. See the GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public
+#   License along with this program; if not, write to the Free
+#   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+#   Boston, MA 02110-1301, USA.
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+export TEST=/CoreOS/bind/Sanity/Master-server-not-chrooted
+export TESTVERSION=1.0
+
+BUILT_FILES=
+
+FILES=$(METADATA) runtest.sh Makefile PURPOSE named.conf zonefile 
+
+.PHONY: all install download clean
+
+run: $(FILES) build
+	./runtest.sh
+
+build: $(BUILT_FILES)
+	chmod a+x runtest.sh
+
+clean:
+	rm -f *~ $(BUILT_FILES)
+
+
+include /usr/share/rhts/lib/rhts-make.include
+
+$(METADATA): Makefile
+	@echo "Owner:           Martin Cermak <mcermak@redhat.com>" > $(METADATA)
+	@echo "Name:            $(TEST)" >> $(METADATA)
+	@echo "TestVersion:     $(TESTVERSION)" >> $(METADATA)
+	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
+	@echo "Description:     Set up master nameserver in chrooted env, test it." >> $(METADATA)
+	@echo "Type:            Sanity" >> $(METADATA)
+	@echo "TestTime:        5m" >> $(METADATA)
+	@echo "RunFor:          bind" >> $(METADATA)
+	@echo "Requires:        bind bind-chroot redhat-lsb" >> $(METADATA)
+	@echo "Requires:        bind-utils" >> $(METADATA)
+	@echo "Priority:        Normal" >> $(METADATA)
+	@echo "License:         GPLv2" >> $(METADATA)
+	@echo "Confidential:    no" >> $(METADATA)
+	@echo "Destructive:     no" >> $(METADATA)
+	@echo "RhtsRequires: library(bind/bind-setup)" >> $(METADATA)
+
+	rhts-lint $(METADATA)
diff --git a/Sanity/Master-server-not-chrooted/PURPOSE b/Sanity/Master-server-not-chrooted/PURPOSE
new file mode 100644
index 0000000..92cb7bd
--- /dev/null
+++ b/Sanity/Master-server-not-chrooted/PURPOSE
@@ -0,0 +1,6 @@
+PURPOSE of /CoreOS/bind/Sanity/Master-server-not-chrooted
+Description: Set up master nameserver in chrooted env, test it.
+             This is a very basic sanity test for bind9.
+             The main purpose for me was to learn how
+             bind works :-)
+Author: Martin Cermak <mcermak@redhat.com>
diff --git a/Sanity/Master-server-not-chrooted/main.fmf b/Sanity/Master-server-not-chrooted/main.fmf
new file mode 100644
index 0000000..110d533
--- /dev/null
+++ b/Sanity/Master-server-not-chrooted/main.fmf
@@ -0,0 +1,11 @@
+component: bind
+contact: Petr Sklenar <psklenar@redhat.com>
+description: |4
+                 This is a very basic sanity test for bind9.
+                 The main purpose for me was to learn how
+                 bind works :-)
+    Author: Martin Cermak <mcermak@redhat.com>
+duration: 90m
+relevancy: ''
+summary: Set up master nameserver in chrooted env, test it.
+test: make run
diff --git a/Sanity/Master-server-not-chrooted/named.conf b/Sanity/Master-server-not-chrooted/named.conf
new file mode 100644
index 0000000..e477af9
--- /dev/null
+++ b/Sanity/Master-server-not-chrooted/named.conf
@@ -0,0 +1,11 @@
+options {
+        directory       "/var/named";
+        allow-query     { any; };
+};
+
+zone "<DOMAIN>" IN {
+  type master;
+  file "<DOMAIN>.zone";
+  allow-update { none; };
+};
+
diff --git a/Sanity/Master-server-not-chrooted/runtest.sh b/Sanity/Master-server-not-chrooted/runtest.sh
new file mode 100644
index 0000000..ec62a04
--- /dev/null
+++ b/Sanity/Master-server-not-chrooted/runtest.sh
@@ -0,0 +1,109 @@
+#!/bin/bash
+# vim: dict=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   runtest.sh of /CoreOS/bind/Sanity/Master-server-not-chrooted
+#   Description: Set up master nameserver, test it.
+#   Author: Martin Cermak <mcermak@redhat.com>
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Copyright (c) 2009 Red Hat, Inc. All rights reserved.
+#
+#   This copyrighted material is made available to anyone wishing
+#   to use, modify, copy, or redistribute it subject to the terms
+#   and conditions of the GNU General Public License version 2.
+#
+#   This program is distributed in the hope that it will be
+#   useful, but WITHOUT ANY WARRANTY; without even the implied
+#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+#   PURPOSE. See the GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public
+#   License along with this program; if not, write to the Free
+#   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+#   Boston, MA 02110-1301, USA.
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+# Include rhts environment
+#set -x
+. /usr/bin/rhts-environment.sh
+. /usr/lib/beakerlib/beakerlib.sh
+
+# Some heplful functions
+randomString () {
+    TEMPSTR=`date +%c%N | md5sum | awk '{print $1}'`
+    echo ${TEMPSTR:0:8}
+    unset TEMPSTR
+}
+
+randomIp () {
+    echo "192.168.1.`echo $[ $RANDOM / 256 + 1 ]`"
+}
+
+randomSerial () {
+    date +%N
+}
+
+# Variable declarations
+CONF="/etc/named.conf"
+IP1=`randomIp`
+IP2=`randomIp`
+IP3=`randomIp`
+IP4=`randomIp`
+IP5=`randomIp`
+SERIAL=`randomSerial`
+ORIGPWD=`pwd`
+
+# The test
+rlJournalStart
+    rlPhaseStartSetup
+        rlRun "TmpDir=\`mktemp -d\`" 0 "Creating tmp directory"
+        rlRun "pushd $TmpDir"
+
+        rlRun "rlImport bind/bind-setup"
+
+        bsBindSetupStart "$ORIGPWD/named.conf" "off"
+
+        rlRun "TDOMAIN=`randomString`.cz"
+        rlRun "TZONEFILE=$ROOTDIR/var/named/$TDOMAIN.zone"
+
+        # set up /etc/named.conf
+        rlRun "sed -i \"s/<DOMAIN>/$TDOMAIN/g\" $CONF"
+
+        # set up zonefile
+        rlRun "cp $ORIGPWD/zonefile $TZONEFILE"
+        rlRun "chmod a+r $TZONEFILE"
+        rlRun "sed -i \"s/<DOMAIN>/$TDOMAIN/g\" $TZONEFILE"
+        rlRun "sed -i \"s/<IP1>/$IP1/g\" $TZONEFILE"
+        rlRun "sed -i \"s/<IP2>/$IP2/g\" $TZONEFILE"
+        rlRun "sed -i \"s/<IP3>/$IP3/g\" $TZONEFILE"
+        rlRun "sed -i \"s/<IP4>/$IP4/g\" $TZONEFILE"
+        rlRun "sed -i \"s/<IP5>/$IP5/g\" $TZONEFILE"
+        rlRun "sed -i \"s/<SERIAL>/$SERIAL/g\" $TZONEFILE"
+
+        bsBindSetupDone
+    rlPhaseEnd
+
+    rlPhaseStartTest
+        # perform tests
+        rlRun "dig @localhost $TDOMAIN | grep \"^$TDOMAIN\" | head -n 1 | grep \"$IP1\""
+        rlRun "dig @localhost server1.$TDOMAIN | grep \"^server1.$TDOMAIN\" | grep \"$IP2\""
+        rlRun "dig @localhost server2.$TDOMAIN | grep \"^server2.$TDOMAIN\" | grep \"$IP3\""
+        rlRun "dig @localhost dns1.$TDOMAIN | grep \"^dns1.$TDOMAIN\" | grep \"$IP4\""
+        rlRun "dig @localhost dns2.$TDOMAIN | grep \"^dns2.$TDOMAIN\" | grep \"$IP5\""
+        rlRun "dig @localhost ftp.$TDOMAIN | grep \"^ftp.$TDOMAIN\" | grep \"server1.$TDOMAIN\""
+        rlRun "dig @localhost mail.$TDOMAIN | grep \"^mail.$TDOMAIN\" | grep \"server1.$TDOMAIN\""
+        rlRun "dig @localhost mail2.$TDOMAIN | grep \"^mail2.$TDOMAIN\" | grep \"server2.$TDOMAIN\""
+        rlRun "dig @localhost www.$TDOMAIN | grep \"^www.$TDOMAIN\" | grep \"server2.$TDOMAIN\""
+
+    rlPhaseEnd
+
+    rlPhaseStartCleanup
+        bsBindSetupCleanup
+        rlRun "popd"
+        rlRun "rm -r $TmpDir" 0 "Removing tmp directory"
+        rlRun "rm -rf $TZONEFILE"
+    rlPhaseEnd
+rlJournalEnd
diff --git a/Sanity/Master-server-not-chrooted/zonefile b/Sanity/Master-server-not-chrooted/zonefile
new file mode 100644
index 0000000..198991e
--- /dev/null
+++ b/Sanity/Master-server-not-chrooted/zonefile
@@ -0,0 +1,27 @@
+$ORIGIN <DOMAIN>.
+$TTL 86400
+@     IN     SOA    dns1.<DOMAIN>.  hostmaster.<DOMAIN>. (
+                    <SERIAL>  ; serial
+                    21600      ; refresh after 6 hours
+                    3600       ; retry after 1 hour
+                    604800     ; expire after 1 week
+                    86400 )    ; minimum TTL of 1 day
+
+      IN     NS     dns1.<DOMAIN>.
+      IN     NS     dns2.<DOMAIN>.
+
+      IN     MX     10     mail.<DOMAIN>.
+      IN     MX     20     mail2.<DOMAIN>.
+
+             IN     A       <IP1>
+
+server1      IN     A       <IP2>
+server2      IN     A       <IP3>
+dns1         IN     A       <IP4>
+dns2         IN     A       <IP5>
+
+ftp          IN     CNAME   server1
+mail         IN     CNAME   server1
+mail2        IN     CNAME   server2
+www          IN     CNAME   server2
+
diff --git a/Sanity/Run-internal-BIND-test-suite/Makefile b/Sanity/Run-internal-BIND-test-suite/Makefile
new file mode 100644
index 0000000..5c1b35f
--- /dev/null
+++ b/Sanity/Run-internal-BIND-test-suite/Makefile
@@ -0,0 +1,77 @@
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Makefile of tests/Run-internal-BIND-test-suite
+#   Description: Run internal BIND test suite
+#   Author: Martin Cermak <mcermak@redhat.com>
+#   Author: Petr Mensik <pemensik@redhat.com>
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Copyright (c) 2010 Red Hat, Inc. All rights reserved.
+#
+#   This copyrighted material is made available to anyone wishing
+#   to use, modify, copy, or redistribute it subject to the terms
+#   and conditions of the GNU General Public License version 2.
+#
+#   This program is distributed in the hope that it will be
+#   useful, but WITHOUT ANY WARRANTY; without even the implied
+#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+#   PURPOSE. See the GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public
+#   License along with this program; if not, write to the Free
+#   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+#   Boston, MA 02110-1301, USA.
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+export TEST=/CoreOS/bind/Sanity/Run-internal-BIND-test-suite
+export TESTVERSION=1.3
+
+BUILT_FILES=
+
+FILES=$(METADATA) runtest.sh Makefile PURPOSE knownerror* setup-named-softhsm.sh bind-systest-filter.sh
+
+.PHONY: all install download clean
+
+run: $(FILES) build
+	./runtest.sh
+
+build: $(BUILT_FILES)
+	chmod a+x runtest.sh
+
+clean:
+	rm -f *~ $(BUILT_FILES)
+
+
+include /usr/share/rhts/lib/rhts-make.include
+
+$(METADATA): Makefile
+	@echo "Owner:           Martin Cermak <mcermak@redhat.com>" > $(METADATA)
+	@echo "Name:            $(TEST)" >> $(METADATA)
+	@echo "TestVersion:     $(TESTVERSION)" >> $(METADATA)
+	@echo "Path:            $(TEST_DIR)" >> $(METADATA)
+	@echo "Description:     Run internal BIND test suite" >> $(METADATA)
+	@echo "Type:            Sanity" >> $(METADATA)
+	@echo "TestTime:        8h" >> $(METADATA)
+	@echo "RunFor:          bind" >> $(METADATA)
+	@echo "Requires:        bind rpm-build bind-utils" >> $(METADATA)
+	@echo "Requires:        perl-Net-DNS perl-Net-DNS-Nameserver" >> $(METADATA)
+	@echo "Requires:        perl-Time-HiRes" >> $(METADATA)
+	@echo "Requires:        bind-pkcs11 bind-pkcs11-utils softhsm" >> $(METADATA)
+	@echo "Requires:        openssl-devel libtool autoconf" >> $(METADATA)
+# Try to satisfy all build dependencies from here
+	@echo "Requires:        bind-devel" >> $(METADATA)
+	@echo "Requires:        net-tools" >> $(METADATA)
+	@echo "Requires:        dnf-utils" >> $(METADATA)
+	@echo "Requires:        kyua" >> $(METADATA)
+	@echo "Requires:        libcmocka-devel" >> $(METADATA)
+# Obsolete, uses cmocka
+#	@echo "Requires:        libatf-c gcc-c++" >> $(METADATA)
+	@echo "Priority:        Normal" >> $(METADATA)
+	@echo "License:         GPLv2" >> $(METADATA)
+	@echo "Confidential:    no" >> $(METADATA)
+	@echo "Destructive:     no" >> $(METADATA)
+	@echo "Bug:             642970" >> $(METADATA)
+
+	rhts-lint $(METADATA)
diff --git a/Sanity/Run-internal-BIND-test-suite/PURPOSE b/Sanity/Run-internal-BIND-test-suite/PURPOSE
new file mode 100644
index 0000000..754ba2a
--- /dev/null
+++ b/Sanity/Run-internal-BIND-test-suite/PURPOSE
@@ -0,0 +1,6 @@
+PURPOSE of tests/Run-internal-BIND-test-suite
+Description: Run internal BIND test suite
+Author: Martin Cermak <mcermak@redhat.com>
+Bug summary: Run internal BIND test suite
+Bugzilla link: https://bugzilla.redhat.com/show_bug.cgi?id=642970
+
diff --git a/Sanity/Run-internal-BIND-test-suite/bind-systest-filter.sh b/Sanity/Run-internal-BIND-test-suite/bind-systest-filter.sh
new file mode 100755
index 0000000..8a153a1
--- /dev/null
+++ b/Sanity/Run-internal-BIND-test-suite/bind-systest-filter.sh
@@ -0,0 +1,47 @@
+#!/bin/bash
+#
+# This script will filter out output from BINDs tests
+# It supports form from BIND 9.9 and BIND 9.11
+# Its purpose is to display only failed tests from list of all tests
+
+CURRENT_TEST=
+CURRENT_OUTPUT=
+STATUS_ONLY=
+
+for P; do
+	case "$P" in
+		-s|--status)	STATUS_ONLY=yes; shift ;;
+	esac
+done
+
+cat $@ | while read LINE; do
+	if [ "${LINE#S:}" != "$LINE" ]; then
+		CURRENT_TEST=`echo $LINE | cut -d: -f2`
+		CURRENT_OUTPUT="$LINE"$'\n'
+	elif [ "${LINE#R:}" != "$LINE" ]; then
+		# echo "$CURRENT_TEST $LINE"
+		if [ "${LINE/#R:*:*}" != "$LINE" ]; then
+			# more recent results contain test name
+			# R:dlz:FAIL
+			CURRENT_TEST="${LINE#R:}"
+			CURRENT_TEST="${CURRENT_TEST/%:*}"
+			RESULT="${LINE/#*:}"
+		else
+			# S:dlz:time
+			# R:FAIL
+			RESULT="${LINE/#R*:/}"
+		fi
+		if [ "$RESULT" != "PASS" ]; then
+			if [ -n "$STATUS_ONLY" ]; then
+				echo "$RESULT $CURRENT_TEST"
+			else
+				CURRENT_OUTPUT+="$LINE"
+				echo "$CURRENT_OUTPUT"
+				echo
+			fi
+		fi
+		CURRENT_OUTPUT=
+	else
+		CURRENT_OUTPUT+="$LINE"$'\n'
+	fi
+done
diff --git a/Sanity/Run-internal-BIND-test-suite/knownerror b/Sanity/Run-internal-BIND-test-suite/knownerror
new file mode 100644
index 0000000..2d0c8e9
--- /dev/null
+++ b/Sanity/Run-internal-BIND-test-suite/knownerror
@@ -0,0 +1,2 @@
+A:System test dlz
+A:System test idna
diff --git a/Sanity/Run-internal-BIND-test-suite/main.fmf b/Sanity/Run-internal-BIND-test-suite/main.fmf
new file mode 100644
index 0000000..c2228ca
--- /dev/null
+++ b/Sanity/Run-internal-BIND-test-suite/main.fmf
@@ -0,0 +1,12 @@
+component: bind
+contact: Petr Sklenar <psklenar@redhat.com>
+description: |+
+    Bug summary: Run internal BIND test suite
+    Bugzilla link: https://bugzilla.redhat.com/show_bug.cgi?id=642970
+
+duration: 8h
+relevancy: ''
+summary: Run internal BIND test suite
+test: make run
+tag: [slow]
+tier: 2
diff --git a/Sanity/Run-internal-BIND-test-suite/runtest.sh b/Sanity/Run-internal-BIND-test-suite/runtest.sh
new file mode 100755
index 0000000..7066344
--- /dev/null
+++ b/Sanity/Run-internal-BIND-test-suite/runtest.sh
@@ -0,0 +1,185 @@
+#!/bin/bash
+# vim: dict=/usr/share/beakerlib/dictionary.vim cpt=.,w,b,u,t,i,k
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   runtest.sh of tests/Run-internal-BIND-test-suite
+#   Description: Run internal BIND test suite
+#   Author: Martin Cermak <mcermak@redhat.com>
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#
+#   Copyright (c) 2010 Red Hat, Inc. All rights reserved.
+#
+#   This copyrighted material is made available to anyone wishing
+#   to use, modify, copy, or redistribute it subject to the terms
+#   and conditions of the GNU General Public License version 2.
+#
+#   This program is distributed in the hope that it will be
+#   useful, but WITHOUT ANY WARRANTY; without even the implied
+#   warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
+#   PURPOSE. See the GNU General Public License for more details.
+#
+#   You should have received a copy of the GNU General Public
+#   License along with this program; if not, write to the Free
+#   Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+#   Boston, MA 02110-1301, USA.
+#
+# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+# Include rhts environment
+. /usr/bin/rhts-environment.sh
+. /usr/lib/beakerlib/beakerlib.sh
+
+PACKAGE="bind"
+
+# Set those variables to n to skip tests on variants
+#DEFAULT_VARIANTS="normal pkcs11 sdb"
+DEFAULT_VARIANTS="normal"
+#TEST_VARIANTS="normal"
+
+#
+# Runs test suite and checks known errors
+# Prepared to be repeated with another variants
+run_testsuite()
+{
+	local RESULT_TEXT="$TMPDIR/test${NAMED_VARIANT}.txt"
+	local FOUNDERROR=`mktemp found-XXXXXXXX.err`
+	local KNOWNERROR=/dev/null
+
+	if [ -f "$ORIG/knownerror${NAMED_VARIANT}.$TAG" ]; then
+		KNOWNERROR=`readlink -f $ORIG/knownerror.$TAG`
+	elif [ -f "$ORIG/knownerror${NAMED_VARIANT}" ]; then
+		KNOWNERROR=`readlink -f $ORIG/knownerror`
+	fi
+
+	# Sometime it can fail. Report just failures that are not known
+        rlRun "make test -j${CORES:-1} &> $RESULT_TEXT" 0-255 "Perform the test."
+        rlRun "grep -C 10 FAIL $RESULT_TEXT" 0-255 "Quickly show the test error (if any)."
+
+	rlRun "$FILTER $RESULT_TEXT" 0 "Showing unsuccessful tests"
+	rlRun "$FILTER -s $RESULT_TEXT > $FOUNDERROR" 0
+	rlRun "ls $KNOWNERROR $FOUNDERROR $RESULT_TEXT" 0 'check if there is needed files'
+	rlLog "`cat $FOUNDERROR`"
+
+	rlAssertLesserOrEqual "Checking number of found errors is in limits" "$(grep '^FAIL' $FOUNDERROR | wc -l)" "$(wc -l <$KNOWNERROR)"
+        cat $FOUNDERROR | while read STATUS TEST ; do
+		if [ "$STATUS" = FAIL ]; then
+			rlRun "grep '$TEST' $KNOWNERROR" 0 "Check $TEST failure is expected"
+		else
+			rlLog "$STATUS $TEST"
+		fi
+        done
+}
+
+rlJournalStart
+    rlPhaseStartSetup
+        # package assertions
+        rlAssertRpm $PACKAGE 
+        rlAssertRpm rpm-build
+        rlAssertRpm perl-Net-DNS-Nameserver
+
+	#pwd
+	ORIG=`pwd`
+	SETUP_SOFTHSM=`readlink -f setup-named-softhsm.sh`
+	FILTER=`readlink -f bind-systest-filter.sh`
+	CORES=`grep 'processor\s*:' /proc/cpuinfo | wc -l`
+
+	TAG=generic
+	if [ -f /etc/os-release ]; then
+		# extract platform tag
+		TAG=`(source /etc/os-release && echo ${PLATFORM_ID#platform:})`
+	fi
+
+        #tempdir
+        rlRun "TMPDIR=\`mktemp -d\`" 0 "Creating tmp directory"
+        rlRun "pushd $TMPDIR"
+
+        # topdir
+	TOPDIR=`rpm -E '%{_topdir}'`
+
+        # cleanup in topdir
+        mkdir -p $TOPDIR/{BUILD,SOURCES,SPECS}
+        rm -rf $TOPDIR/{BUILD,SOURCES,SPECS}/*
+
+        # download src rpm
+	if ! ls bind*.src.rpm; then
+		rlRun "dnf --enablerepo='*-source' download --source bind" 0 "Fetch source from repository"
+		rlRun "rpm -i bind*.src.rpm"
+	fi
+	
+        rlRun "rpm --define '_topdir $TOPDIR' -Uvh *rpm &> $TMPDIR/install.txt"
+        rlRun "cd $TOPDIR/SPECS" 
+
+	rlRun "dnf -y builddep *.spec"
+
+        # stop bind if it is running
+        rlServiceStop named
+    rlPhaseEnd
+
+    rlPhaseStartTest
+        # rebuild from source
+        rlRun "rpmbuild -ba *.spec &> $TMPDIR/build.txt"
+
+        # the test
+        rlRun "cd $TOPDIR/BUILD/bind*"
+
+        rlLogInfo "Test takes place in `pwd`"
+
+        rlRun "chown -R root ."
+
+	if [ -x "$SETUP_SOFTHSM" ]; then
+		rlRun "eval \"$(bash $SETUP_SOFTHSM -A)\"" 0 "Preparing PKCS#11 token slot"
+		rlRun "pkcs11-tokens" 0 "Testing token slot availability"
+	else
+		rlLog "PKCS#11 not initialized"
+	fi
+
+	if [ -d build ]; then
+		BUILD=build
+	else
+		BUILD=.
+	fi
+
+        rlRun "./bin/tests/system/ifconfig.sh up" 0 "Setup fake network interfaces."
+
+	# required by idna test 
+	export LC_ALL=en_US.UTF-8
+
+        rlRun "pushd $BUILD"
+
+	if echo "${TEST_VARIANTS:-$DEFAULT_VARIANTS}" | grep -q normal; then
+		rlLog "Running normal variant"
+		export NAMED_VARIANT= DNSSEC_VARIANT=
+		run_testsuite
+		rlLog "Finished normal variant"
+	fi
+
+	if echo "${TEST_VARIANTS:-$DEFAULT_VARIANTS}" | grep -q sdb; then
+		rlLog "Running sdb variant"
+		export NAMED_VARIANT=-sdb DNSSEC_VARIANT=
+		run_testsuite
+		rlLog "Finished sdb variant"
+	fi
+
+	if echo "${TEST_VARIANTS:-$DEFAULT_VARIANTS}" | grep -q pkcs11; then
+		rlLog "Running pkcs11 variant"
+		# Unfortunately, PKCS11 variant uses shared key storage
+		# It cannot use more threads for that reason
+		export NAMED_VARIANT=-pkcs11 DNSSEC_VARIANT=-pkcs11
+		CORES=1 run_testsuite
+		rlLog "Finished pkcs11 variant"
+	fi
+
+        rlRun "popd"
+
+        rlRun "./bin/tests/system/ifconfig.sh down" 0 "Remove fake network interfaces."
+
+    rlPhaseEnd
+
+    rlPhaseStartCleanup
+        rlBundleLogs "BUILD_LOGS" "$TMPDIR/install.txt" "$TMPDIR/builddeps.txt" "$TMPDIR/build.txt"
+        rlBundleLogs "TEST_LOGS" "$TMPDIR"/test*.txt
+        rlRun "popd"
+        rlRun "rm -r $TMPDIR" 0 "Removing tmp directory"
+    rlPhaseEnd
+rlJournalEnd
diff --git a/Sanity/Run-internal-BIND-test-suite/setup-named-softhsm.sh b/Sanity/Run-internal-BIND-test-suite/setup-named-softhsm.sh
new file mode 100755
index 0000000..a13c91e
--- /dev/null
+++ b/Sanity/Run-internal-BIND-test-suite/setup-named-softhsm.sh
@@ -0,0 +1,123 @@
+#!/bin/sh
+#
+# This script will initialise token storage of softhsm PKCS11 provider
+# in custom location. Is useful to store tokens in non-standard location.
+#
+# Output can be evaluated from bash, it will prepare it for usage of temporary tokens.
+# Recommended use:
+# eval $(bash setup-named-softhsm.sh -A)
+#
+
+SOFTHSM2_CONF="$1"
+TOKENPATH="$2"
+GROUPNAME="$3"
+# Do not use this script for real keys worth protection
+# This is intended for crypto accelerators using PKCS11 interface.
+# Uninitialized token would fail any crypto operation.
+PIN=1234
+SO_PIN=1234
+LABEL=rpm
+
+set -e
+
+echo_i()
+{
+	echo "#" $@
+}
+
+random()
+{
+	if [ -x "$(which openssl 2>/dev/null)" ]; then
+		openssl rand -base64 $1
+	else
+		dd if=/dev/urandom bs=1c count=$1 | base64
+	fi
+}
+
+usage()
+{
+	echo "Usage: $0 -A [token directory] [group]"
+	echo "   or: $0 <config file> <token directory> [group]"
+}
+
+if [ "$SOFTHSM2_CONF" = "-A" -a -z "$TOKENPATH" ]; then
+	TOKENPATH=$(mktemp -d /var/tmp/softhsm-XXXXXX)
+fi
+
+if [ -z "$SOFTHSM2_CONF" -o -z "$TOKENPATH" ]; then
+	usage >&2
+	exit 1
+fi
+
+if [ "$SOFTHSM2_CONF" = "-A" ]; then
+	# Automagic mode instead
+	MODE=secure
+	SOFTHSM2_CONF="$TOKENPATH/softhsm2.conf"
+	PIN_SOURCE="$TOKENPATH/pin"
+	SOPIN_SOURCE="$TOKENPATH/so-pin"
+	TOKENPATH="$TOKENPATH/tokens"
+else
+	MODE=legacy
+fi
+
+[ -d "$TOKENPATH" ] || mkdir -p "$TOKENPATH"
+
+umask 0022
+
+if ! [ -f "$SOFTHSM2_CONF" ]; then
+cat  << SED > "$SOFTHSM2_CONF"
+# SoftHSM v2 configuration file
+
+directories.tokendir = ${TOKENPATH}
+objectstore.backend = file
+
+# ERROR, WARNING, INFO, DEBUG
+log.level = ERROR
+
+# If CKF_REMOVABLE_DEVICE flag should be set
+slots.removable = false
+SED
+else
+	echo_i "Config file $SOFTHSM2_CONF already exists" >&2
+fi
+
+if [ -n "$PIN_SOURCE" ]; then
+	touch "$PIN_SOURCE" "$SOPIN_SOURCE"
+	chmod 0600 "$PIN_SOURCE" "$SOPIN_SOURCE"
+	if [ -n "$GROUPNAME" ]; then
+		chgrp "$GROUPNAME" "$PIN_SOURCE" "$SOPIN_SOURCE"
+		chmod g+r "$PIN_SOURCE" "$SOPIN_SOURCE"
+	fi
+fi
+
+export SOFTHSM2_CONF
+
+if softhsm2-util --show-slots | grep 'Initialized:[[:space:]]*yes' > /dev/null
+then
+	echo_i "Token in ${TOKENPATH} is already initialized" >&2
+
+	[ -f "$PIN_SOURCE" ] && PIN=$(cat "$PIN_SOURCE")
+	[ -f "$SOPIN_SOURCE" ] && SO_PIN=$(cat "$SOPIN_SOURCE")
+else
+	PIN=$(random 6)
+	SO_PIN=$(random 18)
+	if [ -n "$PIN_SOURCE" ]; then
+		echo -n "$PIN" > "$PIN_SOURCE"
+		echo -n "$SO_PIN" > "$SOPIN_SOURCE"
+	fi
+
+	echo_i "Initializing tokens to ${TOKENPATH}..."
+	softhsm2-util --init-token --free --label "$LABEL" --pin "$PIN" --so-pin "$SO_PIN" | sed -e 's/^/# /'
+
+	if [ -n "$GROUPNAME" ]; then
+		chgrp -R -- "$GROUPNAME" "$TOKENPATH"
+		chmod -R -- g=rX,o= "$TOKENPATH"
+	fi
+fi
+
+echo "export SOFTHSM2_CONF=\"$SOFTHSM2_CONF\""
+echo "export PIN_SOURCE=\"$PIN_SOURCE\""
+echo "export SOPIN_SOURCE=\"$SOPIN_SOURCE\""
+# These are intentionaly not exported
+echo "PIN=\"$PIN\""
+echo "SO_PIN=\"$SO_PIN\""
diff --git a/Sanity/basic.fmf b/Sanity/basic.fmf
new file mode 100644
index 0000000..d9ce621
--- /dev/null
+++ b/Sanity/basic.fmf
@@ -0,0 +1,6 @@
+summary:
+    Basic smoke test
+discover:
+    how: fmf
+execute:
+    how: beakerlib