--- ./src/tests/inpty.cc.orig	2021-05-27 09:52:09 +0000
+++ ./src/tests/inpty.cc	2021-05-27 09:52:31 +0000
@@ -32,6 +32,7 @@
 
 #include "config.h"
 
+#include <sys/ioctl.h>
 #include <sys/types.h>
 #include <sys/wait.h>
 #include <errno.h>
--- ./src/tests/encrypt-decrypt.cc.orig	2021-05-28 01:45:30 +0000
+++ ./src/tests/encrypt-decrypt.cc	2021-05-28 01:46:11 +0000
@@ -54,6 +54,10 @@
 
 bool verbose = false;
 
+#ifndef PRIx64
+#define PRIx64 "lx"
+#endif
+
 #define NONCE_FMT "%016" PRIx64
 
 static std::string random_payload( void ) {
--- ./src/tests/e2e-test-subrs.orig	2021-06-01 00:30:04 +0000
+++ ./src/tests/e2e-test-subrs	2021-06-01 00:28:54 +0000
@@ -71,7 +71,7 @@
     fi
     # Attempt to find/set a usable locale.
     unset LANG LC_CTYPE LC_COLLATE LC_MESSAGES LC_MONETARY LC_NUMERIC LC_TIME LC_ALL
-    for i in en_US.UTF-8 en_US.utf8 C.UTF-8; do
+    for i in EN_US.UTF-8 en_US.utf8 C.UTF-8; do
 	if env LC_ALL=$i ./is-utf8-locale 2> /dev/null; then
 	    export LC_ALL=$i
 	    return 0