diff --git a/app/tests/create_test_env.sh b/app/tests/create_test_env.sh
index 4bf5bfd458..c66c3a0f84 100755
--- a/app/tests/create_test_env.sh
+++ b/app/tests/create_test_env.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # Copy tests resources
 for dir in files gimpdir gimpdir-empty; do
diff --git a/tools/gimp-mkenums b/tools/gimp-mkenums
index f39103f567..e009f2f9fa 100755
--- a/tools/gimp-mkenums
+++ b/tools/gimp-mkenums
@@ -1,4 +1,6 @@
-#!/usr/bin/perl -w
+#!/usr/bin/env perl
+
+use warnings;
 
 # This is gimp-mkenums, a perl script based on glib-mkenums.
 # It can be used just like glib-mkenums but offers one extra