diff --git a/hapi-fhir-checkstyle/src/checkstyle/hapi-base-checkstyle.xml b/hapi-fhir-checkstyle/src/checkstyle/hapi-base-checkstyle.xml
index c74e8b7e01c..3febae4ba9b 100644
--- a/hapi-fhir-checkstyle/src/checkstyle/hapi-base-checkstyle.xml
+++ b/hapi-fhir-checkstyle/src/checkstyle/hapi-base-checkstyle.xml
@@ -63,5 +63,14 @@
 		<module name="AbstractClassName">
 			<property name="format" value="^(Base|Abstract).+$"/>
 		</module>
+
+
+		<!-- for suppression of rules; to use, surround code to exclude with comments: -->
+		<!-- CHECKSTYLE.OFF RuleToDisable   AND   CHECKSTYLE.ON RuleToDisable -->
+		<module name="SuppressWithPlainTextCommentFilter">
+			<property name="offCommentFormat" value="CHECKSTYLE.OFF\: ([\w\|]+)" />
+			<property name="onCommentFormat" value="CHECKSTYLE.ON\: ([\w\|]+)" />
+		</module>
 	</module>
+
 </module>
diff --git a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/reindex/CheckPendingReindexWorkStep.java b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/reindex/CheckPendingReindexWorkStep.java
index 3b2505ace98..7258821f057 100644
--- a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/reindex/CheckPendingReindexWorkStep.java
+++ b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/reindex/CheckPendingReindexWorkStep.java
@@ -30,12 +30,12 @@ public class CheckPendingReindexWorkStep implements IJobStepWorker<ReindexJobPar
 
 		if (!results.getResourceToHasWorkToComplete().isEmpty()) {
 			if (myReindexJobService.anyResourceHasPendingReindexWork(results.getResourceToHasWorkToComplete())) {
-				/* CHECKSTYLE.OFF: RegexpSingleLine
+				/* CHECKSTYLE.OFF: HapiErrorCodeUniqueness
 				 * This exception is never fed to users and is only part of our structure
 				 * So there's no need to use an error code
 				 */
 				throw new RetryChunkLaterException(ReindexUtils.getRetryLaterDelay());
-				/* CHECKSTYLE.ON: RegexpSingleLine */
+				/* CHECKSTYLE.ON: HapiErrorCodeUniqueness */
 			}
 		}
 
diff --git a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/reindex/ReindexStepV2.java b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/reindex/ReindexStepV2.java
index 097a6389601..1d7dd119a0c 100644
--- a/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/reindex/ReindexStepV2.java
+++ b/hapi-fhir-storage-batch2-jobs/src/main/java/ca/uhn/fhir/batch2/jobs/reindex/ReindexStepV2.java
@@ -53,12 +53,12 @@ public class ReindexStepV2 extends BaseReindexStep
 			resourceTypesToCheckFlag.put(id.getResourceType(), true);
 		});
 		if (myReindexJobService.anyResourceHasPendingReindexWork(resourceTypesToCheckFlag)) {
-			/* CHECKSTYLE.OFF: RegexpSingleLine
+			/* CHECKSTYLE.OFF: HapiErrorCodeUniqueness
 			 * This exception is never fed to users and is only part of our structure
 			 * So there's no need to use an error code
 			 */
 			throw new RetryChunkLaterException(ReindexUtils.getRetryLaterDelay());
-			/* CHECKSTYLE.ON: RegexpSingleLine */
+			/* CHECKSTYLE.ON: HapiErrorCodeUniqueness */
 		}
 
 		ReindexResults results = doReindex(