diff --git a/Sanity/delv-smoke-test/runtest.sh b/Sanity/delv-smoke-test/runtest.sh
index d42d3a2..556e60a 100755
--- a/Sanity/delv-smoke-test/runtest.sh
+++ b/Sanity/delv-smoke-test/runtest.sh
@@ -34,19 +34,35 @@ rlJournalStart
     rlPhaseStartSetup
         rlAssertRpm $PACKAGE-utils
 	rlRun "cat /etc/resolv.conf"
+	if dig +dnssec  dnskey | grep RRSIG; then
+		rlLog "Infrastructure supports DNSSEC"
+		DNSSEC=yes
+	else
+		DNSSEC=no
+	fi
+	rlRun "" 0 "Check infrastructure supports DNSSEC records"
     rlPhaseEnd
 
     rlPhaseStartTest
-      if delv redhat.com | grep IN;then
-	rlRun "delv redhat.com | grep IN"
-	rlRun "delv redhat.com soa +multi | grep serial"
-	LINES=$(delv +multi +vtrace|wc -l)
+	rlRun -l -s "delv redhat.com"
+	rlAssertGrep 'IN' $rlRun_LOG
+	rlRun -s "delv redhat.com soa +multi"
+	rlAssertGrep 'serial' $rlRun_LOG
+	rlRun -s "delv +multi +vtrace"
+	LINES=$(wc -l $rlRun_LOG)
 	rlAssertGreater "delv +vtrace should show few lines" "$LINES" "10"
 	rlRun "delv +vtrace | grep 'fully validated'"
-      fi
-	rlLog "`delv redhat.com`"
+	if [ "$DNSSEC" = yes ]; then
+		rlRun -s "delv"
+		rlAssertGrep 'fully validated' $rlRun_LOG
+		rlRun -s "delv example.net"
+		rlAssertGrep 'fully validated' $rlRun_LOG
+		rlRun -s "delv +vtrace fedoraproject.org"
+		rlAssertGrep 'fully validated' $rlRun_LOG
+		rlAssertGrep 'marking as secure' $rlRun_LOG
+
+	fi
 	cat /etc/resolv.conf
-	
     rlPhaseEnd
 
 rlJournalPrintText