@@ -11,11 +11,11 @@
     # Test info
     set line [format "tcltest::test %s-%d.%d {%s}" $group $file_num $tc $tail]
     append line " \\\n\t"
 
     # Test constraints
-    append line [format "-constraints %s" $kdf]
+    append line [format "-constraints {%s %s}" [string map [list "-" "_"] $kdf] [string map [list "-" "_"] $digest]]
     append line " \\\n\t"
 
     # Test setup
     append line "-setup {} \\\n\t"
 
@@ -50,10 +50,11 @@
     # Test result
     set result ""
     foreach name [list OKM DK Output] {
 	if {[info exists config($name)]} {
 	    set result $config($name)
+	    break
 	}
     }
     
     append line [format {-match exact -result %s} $result]
 
@@ -85,12 +86,16 @@
 
     # Add config info
     puts $out [format "# Auto generated from \"%s\"" [file tail $filename]]
     puts $out "package require tls"
     puts $out "package require tcltest\n"
-    puts $out [format "tcltest::testConstraint %s %s" $kdf \
+    puts $out [format "tcltest::testConstraint %s %s" [string map [list "-" "_"] $kdf] \
 	[format {[expr {[lsearch -nocase [tls::kdfs] %s] > -1}]} $kdf]]
+    if {$digest ne ""} {
+	puts $out [format "tcltest::testConstraint %s %s" [string map [list "-" "_"] $digest] \
+	    [format {[expr {[lsearch -nocase [tls::digests] %s] > -1}]} $digest]]
+    }
     puts $out ""
 
     # Process file
     while {![eof $ch]} {
 	gets $ch line