diff --git a/src/freeglut-test.c b/src/freeglut-test.c
index f49d7ae6..ef6d1c9a 100644
--- a/src/freeglut-test.c
+++ b/src/freeglut-test.c
@@ -13,10 +13,10 @@ int main(int argc, char *argv[])
     glutInitWindowSize(640,480);
     glutInitWindowPosition(10,10);
     glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE | GLUT_DEPTH);
- 
+
     glutCreateWindow("FreeGLUT Shapes");
 
     glutMainLoop();
- 
+
     return(0);
 }
diff --git a/src/gsl-test.c b/src/gsl-test.c
index d7eaf316..00ac9a8b 100644
--- a/src/gsl-test.c
+++ b/src/gsl-test.c
@@ -6,7 +6,7 @@
 #include <stdio.h>
 #include <gsl/gsl_sf_bessel.h>
 
-int main(int argc, char *argv[]) 
+int main(int argc, char *argv[])
 {
     double x, y;
 
diff --git a/src/libffi-test.c b/src/libffi-test.c
index 871e22ed..86c781a9 100644
--- a/src/libffi-test.c
+++ b/src/libffi-test.c
@@ -13,7 +13,7 @@ int main(int argc, char *argv[])
     void *values[1];
     char *s;
     int rc;
-    
+
     (void)argc;
     (void)argv;
 
diff --git a/src/libical-test.c b/src/libical-test.c
index 9ad32cf1..3e0de84b 100644
--- a/src/libical-test.c
+++ b/src/libical-test.c
@@ -8,11 +8,11 @@
 
 int main(int argc, char *argv[])
 {
-    icalvalue *v; 
+    icalvalue *v;
     char *str;
     (void)argc;
     (void)argv;
-    
+
     v = icalvalue_new_caladdress("cap://value/1");
     str = icalvalue_as_ical_string_r(v);
     printf("String: %s\n", str);
diff --git a/src/libpng-test.c b/src/libpng-test.c
index 0ec67187..f6f033fe 100644
--- a/src/libpng-test.c
+++ b/src/libpng-test.c
@@ -11,28 +11,28 @@
 #include <unistd.h>
 #include <string.h>
 #include <png.h>
- 
+
 int main(int argc, char *argv[])
 {
     (void)argc;
     (void)argv;
-    
+
     /* PNG structs and types */
     png_byte color_type;
     png_byte bit_depth;
     png_structp png_ptr;
     png_infop info_ptr;
     png_bytep *row_pointers;
- 
+
     int height, width;
     FILE *fp;
- 
+
     width = 640;
     height = 480;
- 
+
     color_type = PNG_COLOR_TYPE_RGB;
     bit_depth = 8; /* Number of bits per color, not per pixel */
- 
+
     /* Dynamic 2D array in C */
     row_pointers = (png_bytep *)malloc( sizeof(png_bytep) * height);
     int i;
@@ -47,7 +47,7 @@ int main(int argc, char *argv[])
             row_pointers[i][2+3*j] = (i * j) % 255; /* B */
         }
     }
- 
+
     /* Write the data out to the PNG file */
     fp = fopen("test.png","wb");
     png_ptr = png_create_write_struct(PNG_LIBPNG_VER_STRING,NULL,NULL,NULL);
@@ -59,13 +59,13 @@ int main(int argc, char *argv[])
     png_write_info(png_ptr, info_ptr);
     png_write_image(png_ptr, row_pointers);
     png_write_end(png_ptr, NULL);
- 
+
     /* Free up memory after use */
     for(i = 0; i < height; i++)
     {
         free(row_pointers[i]);
     }
     free(row_pointers);
- 
+
     return 0;
 }
diff --git a/src/vigra-test.cpp b/src/vigra-test.cpp
index 6d7f70a8..538a409c 100644
--- a/src/vigra-test.cpp
+++ b/src/vigra-test.cpp
@@ -12,8 +12,8 @@ using namespace vigra;
 int main(int argc, char *argv[])
 {
     std::string formats = vigra::impexListFormats();
-    
+
     std::cout << "Supported formats: " << formats << std::endl;
-    
+
     return formats.length() > 0;
 }
diff --git a/tools/create-screenshot-for-doc b/tools/create-screenshot-for-doc
index 4175fbea..e361670f 100755
--- a/tools/create-screenshot-for-doc
+++ b/tools/create-screenshot-for-doc
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -eu
 
 if [ "$#" -ne 2 ]; then
diff --git a/tools/patch-tool-mxe b/tools/patch-tool-mxe
index 8450dd45..c130fae9 100755
--- a/tools/patch-tool-mxe
+++ b/tools/patch-tool-mxe
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 # Tool for converting between MXE patch files and git repos
 # Imports and exports patch files in "git format-patch" format.