diff --git a/framework b/framework
index 7acada6a92..071831e25b 160000
--- a/framework
+++ b/framework
@@ -1 +1 @@
-Subproject commit 7acada6a928031340d390b2dce645a3b6129ddad
+Subproject commit 071831e25bd336baa58bbdf65e985283f56e1b86
diff --git a/tests/ssl-opt.sh b/tests/ssl-opt.sh
index 6271e8aeb5..f24a6a97d4 100755
--- a/tests/ssl-opt.sh
+++ b/tests/ssl-opt.sh
@@ -543,7 +543,8 @@ adapt_cmd_for_psk () {
     case "$2" in
         *openssl*s_server*) s='-psk 73776f726466697368 -nocert';;
         *openssl*) s='-psk 73776f726466697368';;
-        *gnutls-*) s='--pskusername=Client_identity --pskkey=73776f726466697368';;
+        *gnutls-cli*) s='--pskusername=Client_identity --pskkey=73776f726466697368';;
+        *gnutls-serv*) s='--pskpasswd=../framework/data_files/simplepass.psk';;
         *) s='psk=73776f726466697368';;
     esac
     eval $1='"$2 $s"'