Fix failing tests on HD 4000

Fixes two failing tests on the HD 4000. #1399.