Try using the decorator from test_engine_service.py

Change-Id: Ie036355df30384616ec23bd0cfd9c769278dcd0e