Fix tests for Makefile change
Merge pull request #1726 from github/makefile-tests

Fix tests for Makefile change