Disable test completely if requested

Change-Id: I454a0dc34bd9b69de5543eda8159df823321a2c7