diff --git a/contrib/avocado-find-unittests b/contrib/scripts/avocado-find-unittests
similarity index 100%
rename from contrib/avocado-find-unittests
rename to contrib/scripts/avocado-find-unittests
diff --git a/selftests/checkall b/selftests/checkall
index 833ee3554ab0ec6d06afaa8c443556794d8e5134..ce4894e6b6d385aebf89582c315855a06e3ca990 100755
--- a/selftests/checkall
+++ b/selftests/checkall
@@ -19,6 +19,6 @@ if [ -z "$AVOCADO_SELF_CHECK" ]; then
     run_rc selftests/run
 else
     run_rc 'python setup.py develop --user'
-    run_rc 'scripts/avocado run `./contrib/avocado-find-unittests selftests/{unit,functional,doc}/*.py | xargs` --external-runner="/usr/bin/python -m unittest"'
+    run_rc 'scripts/avocado run `./contrib/scripts/avocado-find-unittests selftests/{unit,functional,doc}/*.py | xargs` --external-runner="/usr/bin/python -m unittest"'
 fi
 exit ${GR}