diff --git a/mysite/_config/environmentcheck.yml b/mysite/_config/environmentcheck.yml
index 5e66ae6..b34c393 100644
--- a/mysite/_config/environmentcheck.yml
+++ b/mysite/_config/environmentcheck.yml
@@ -6,10 +6,20 @@ SilverStripe\EnvironmentCheck\EnvironmentCheckSuite:
     db:
       definition: 'SilverStripe\EnvironmentCheck\Checks\DatabaseCheck()'
       title: 'Is the database accessible?'
+  registered_suites:
+    health:
+      - db
+
+---
+Name: cwpcoresolrenvironmentcheck
+Only:
+  moduleexists: 'cwp/cwp-search'
+---
+SilverStripe\EnvironmentCheck\EnvironmentCheckSuite:
+  registered_checks:
     solr:
       definition: 'SilverStripe\EnvironmentCheck\Checks\SolrIndexCheck()'
       title: 'Are all Solr indexes available?'
   registered_suites:
     health:
-      - db
       - solr