diff --git a/tools/pyflakes.sh b/tools/pyflakes.sh
index 5f5a053b..bd64f221 100755
--- a/tools/pyflakes.sh
+++ b/tools/pyflakes.sh
@@ -1,7 +1,6 @@
 #!/bin/bash
-if [ `basename $PWD` == 'tools' ]; then
-        cd ..
-fi
+cd $(dirname $0)
+cd ..
 
 # grep will return 0 only if it founds something, but our script
 # wants to return 0 when it founds nothing!