diff --git a/contrib/findoidjoins/make_oidjoins_check b/contrib/findoidjoins/make_oidjoins_check
index 4fc9e61875e080d915bfd80d18b044de58d3f132..508d435c6d75e8006396ef5ac7efcb6f522e49ac 100755
--- a/contrib/findoidjoins/make_oidjoins_check
+++ b/contrib/findoidjoins/make_oidjoins_check
@@ -11,7 +11,6 @@
 AWK=${AWK:-awk}
 
 TMP="/tmp/$$"
-trap "rm -rf $TMP" 0 1 2 3 15
 
 # Create a temporary directory with the proper permissions so no one can
 # intercept our temporary files and cause a security breach.
@@ -24,6 +23,8 @@ fi
 umask "$OMASK"
 unset OMASK
 
+trap "rm -rf $TMP" 0 1 2 3 15
+
 INPUTFILE="$TMP/a"
 DUPSFILE="$TMP/b"
 NONDUPSFILE="$TMP/c"