Ensure Catalyst tests are enabled correctly.

Change-Id: Ica42df50ba4309fa118b26205666355ec722629d
Merge topic 'renable_catalyst_tests' into next

ceb3bf0 Ensure Catalyst tests are enabled correctly.