diff --git a/ocaml/message-switch/core_test/interop-test.sh b/ocaml/message-switch/core_test/interop-test.sh
deleted file mode 100755
index 912d47f2349..00000000000
--- a/ocaml/message-switch/core_test/interop-test.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-set -ex
-
-LINKPATH="${TMPDIR:-/tmp}/link_test"
-
-rm -rf ${LINKPATH} && mkdir -p ${LINKPATH}
-
-lwt/link_test_main.exe
-PYTHONPATH=core python message_switch_test.py
diff --git a/scripts/generate-iscsi-iqn b/scripts/generate-iscsi-iqn
index 882a4c7f6fd..9550435716d 100755
--- a/scripts/generate-iscsi-iqn
+++ b/scripts/generate-iscsi-iqn
@@ -36,7 +36,7 @@ geniqn() {
         domain=${defaultdomain}
     fi
 
-    revdomain=$(python -c "${REVERSE_PY}" $domain)
+    revdomain=$(python3 -c "${REVERSE_PY}" $domain)
 
     uuid=$(uuidgen | cut -d- -f1)
     date=$(date +"%Y-%m")
diff --git a/scripts/xe-backup-metadata b/scripts/xe-backup-metadata
index 43c4617ec3b..19f0cf0e4a9 100755
--- a/scripts/xe-backup-metadata
+++ b/scripts/xe-backup-metadata
@@ -51,7 +51,7 @@ function usage {
 function uuid5 {
   # could use a modern uuidgen but it's not on XS 8
   # should work with Python 2 and 3
-  python -c "import uuid; print (uuid.uuid5(uuid.UUID('$1'), '$2'))"
+  python3 -c "import uuid; print (uuid.uuid5(uuid.UUID('$1'), '$2'))"
 }
 
 function test_sr {
diff --git a/scripts/xe-restore-metadata b/scripts/xe-restore-metadata
index 5968dc102e8..ca7029d7c07 100755
--- a/scripts/xe-restore-metadata
+++ b/scripts/xe-restore-metadata
@@ -65,7 +65,7 @@ function test_sr {
 NS="e93e0639-2bdb-4a59-8b46-352b3f408c19"
 function uuid5 {
   # could use a modern uuidgen but it's not on XS 8
-  python -c "import uuid; print (uuid.uuid5(uuid.UUID('$1'), '$2'))"
+  python3 -c "import uuid; print (uuid.uuid5(uuid.UUID('$1'), '$2'))"
 }
 
 dry_run=0