Just move the tests into two separate directories and add instructions on how to run them. Change-Id: I45dbed3306c35ce49116654534609cf81b441149