diff --git a/lib/libx52util/x52_char_map_gen.py b/lib/libx52util/x52_char_map_gen.py
index 8f5a1f4..f52a9d6 100755
--- a/lib/libx52util/x52_char_map_gen.py
+++ b/lib/libx52util/x52_char_map_gen.py
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 # Character map generator
 #
 # Copyright (C) 2012-2018 Nirenjan Krishnan (nirenjan@nirenjan.org)
diff --git a/tests/common_infra.sh b/tests/common_infra.sh
index 02f9be6..80c0e57 100644
--- a/tests/common_infra.sh
+++ b/tests/common_infra.sh
@@ -79,7 +79,7 @@ find_programs()
     fi
 
     # Find the X52cli script
-    X52CLI=$(find .. -path '*/cli/x52cli' -executable)
+    X52CLI=$(find .. -path '*/cli/x52cli' -perm -+x)
 
     if [[ -z "$X52CLI" ]]
     then
@@ -87,14 +87,14 @@ find_programs()
     fi
 
     # Find the x52test_log_actions program
-    X52LOGACT=$(find .. -path '*/libusbx52/x52test_log_actions' -executable)
+    X52LOGACT=$(find .. -path '*/libusbx52/x52test_log_actions' -perm -+x)
     if [[ -z "$X52LOGACT" ]]
     then
         exit 1
     fi
 
     # Find the x52test_create_device_list program
-    X52DEVLIST=$(find .. -path '*/libusbx52/x52test_create_device_list' -executable)
+    X52DEVLIST=$(find .. -path '*/libusbx52/x52test_create_device_list' -perm -+x)
     if [[ -z "$X52DEVLIST" ]]
     then
         exit 1
diff --git a/tests/libx52/test_brightness b/tests/libx52/test_brightness
index 2e6d655..b2d279f 100755
--- a/tests/libx52/test_brightness
+++ b/tests/libx52/test_brightness
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # MFD & LED brightness tests
 #
 # Copyright (C) 2012-2018 Nirenjan Krishnan (nirenjan@nirenjan.org)
diff --git a/tests/libx52/test_clock b/tests/libx52/test_clock
index 7e5b0d1..def836d 100755
--- a/tests/libx52/test_clock
+++ b/tests/libx52/test_clock
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Clock tests
 #
 # Copyright (C) 2012-2018 Nirenjan Krishnan (nirenjan@nirenjan.org)
diff --git a/tests/libx52/test_indicator b/tests/libx52/test_indicator
index 0caf456..8b4dcbb 100755
--- a/tests/libx52/test_indicator
+++ b/tests/libx52/test_indicator
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Indicator (blink & shift) tests
 #
 # Copyright (C) 2012-2018 Nirenjan Krishnan (nirenjan@nirenjan.org)
diff --git a/tests/libx52/test_leds b/tests/libx52/test_leds
index 4b61bc1..569410c 100755
--- a/tests/libx52/test_leds
+++ b/tests/libx52/test_leds
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # LED tests
 #
 # Copyright (C) 2012-2018 Nirenjan Krishnan (nirenjan@nirenjan.org)
diff --git a/tests/libx52/test_mfd b/tests/libx52/test_mfd
index 7e11324..0784080 100755
--- a/tests/libx52/test_mfd
+++ b/tests/libx52/test_mfd
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # MFD tests
 #
 # Copyright (C) 2012-2018 Nirenjan Krishnan (nirenjan@nirenjan.org)
diff --git a/tests/libx52/test_timezone b/tests/libx52/test_timezone
index 083e350..5c65453 100755
--- a/tests/libx52/test_timezone
+++ b/tests/libx52/test_timezone
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Timezone tests
 #
 # Copyright (C) 2020 Nirenjan Krishnan (nirenjan@nirenjan.org)