I usually do something like:
git add -p
git commit
git stash
<run tests>
If it fails then I can stash pop and commit -p --amend and try again.