am 44650b16: Fix vm-tests attempt 2

* commit '44650b16f2f6e14f179b3c9e2feb4e79e9e27573':
  Fix vm-tests attempt 2