Index: gnupg-2.1.11/tests/openpgp/defs.inc
===================================================================
--- gnupg-2.1.11/tests/openpgp/defs.inc
+++ gnupg-2.1.11/tests/openpgp/defs.inc
@@ -211,6 +211,17 @@
   exit 1
 fi
 
+# Enable socket redirect if GNUPGHOME is too long for socket
+if [ `pwd | wc | awk '{print $3}'` -gt 94 ] ; then
+    if [ ! -f "$GNUPGHOME/S.gpg-agent" ] ; then
+        cat <<-EOF > $GNUPGHOME/S.gpg-agent
+%Assuan%
+socket=/tmp/S.gpg-agent.$$
+EOF
+    fi
+fi
+
+
 # We don't use GPG_AGENT_INFO anymore - better reset it.
 unset GPG_AGENT_INFO
 
Index: gnupg-2.1.11/tests/openpgp/finish.test
===================================================================
--- gnupg-2.1.11/tests/openpgp/finish.test
+++ gnupg-2.1.11/tests/openpgp/finish.test
@@ -12,6 +12,18 @@
 if $GPG_AGENT --quiet; then
   $GPG_CONNECT_AGENT killagent /bye >/dev/null
 fi
-
+#Socket should be already removed by agent process
+if [ -f "$GNUPGHOME/S.gpg-agent" ] ; then
+	GPG_AGENT_SOCK_NAME=`grep '^socket=' $GNUPGHOME/S.gpg-agent`
+	# in bash IFS is always set
+	OIFS=$IFS
+	IFS='='
+	set -- $GPG_AGENT_SOCK_NAME
+	shift
+	GPG_AGENT_SOCK_NAME="$*"
+	IFS=$OIFS
+	if [ -n "$GPG_AGENT_SOCK_NAME" -a -e "$GPG_AGENT_SOCK_NAME" ] ; then
+		rm $GPG_AGENT_SOCK_NAME
+	fi
+fi
 exit 0
-