[CLEANUP] - Review build scripts

* Fix the fix.

Don't know why, tests didn't fail in my setup :-?

@pamval please review.