diff --git a/features/SHA_Extractor/sha_extractor.feature b/features/SHA_Extractor/sha_extractor.feature
index 41871467..9b47c3b3 100644
--- a/features/SHA_Extractor/sha_extractor.feature
+++ b/features/SHA_Extractor/sha_extractor.feature
@@ -83,5 +83,4 @@ Feature: SHA Extractor
       And SHA extractor should download tarball from given URL attribute
      When the file "config/workload_info.json" is found
      Then the content of this file needs to be sent into topic "archive_results"
-     When compression is disabled
-     Then Published message should not be compressed
\ No newline at end of file
+      And Published message should not be compressed
\ No newline at end of file
diff --git a/features/SHA_Extractor/sha_extractor_compressed.feature b/features/SHA_Extractor/sha_extractor_compressed.feature
index 71589bbd..016b8dee 100644
--- a/features/SHA_Extractor/sha_extractor_compressed.feature
+++ b/features/SHA_Extractor/sha_extractor_compressed.feature
@@ -33,5 +33,4 @@ Feature: SHA Extractor
       And SHA extractor should download tarball from given URL attribute
      When the file "config/workload_info.json" is found
      Then the content of this file needs to be sent into topic "archive_results"
-     When compression is enabled
-     Then Published message have to be compressed
\ No newline at end of file
+      And Published message have to be compressed
\ No newline at end of file
diff --git a/features/steps/insights_sha_extractor.py b/features/steps/insights_sha_extractor.py
index 08f09eee..ab5ee13c 100644
--- a/features/steps/insights_sha_extractor.py
+++ b/features/steps/insights_sha_extractor.py
@@ -237,10 +237,9 @@ def start_sha_extractor_compressed(context, group_id=None):
     context.sha_extractor = sha_extractor
 
 
-@when("compression is enabled")
 @then("Published message have to be compressed")
 def compressed_archive_sent_to_topic(context):
-    """Check that sha extractor did not process any event."""
+    """Check that sha extractor publish compressed messages to outgoing topic."""
     decoded = None
     error = None
     message = kafka_util.consume_message_from_topic(context.kafka_hostname, context.outgoing_topic)
@@ -251,10 +250,9 @@ def compressed_archive_sent_to_topic(context):
     assert decoded is not None and error is None
 
 
-@when("compression is disabled")
 @then("Published message should not be compressed")
 def no_compressed_archive_sent_to_topic(context):
-    """Check that sha extractor did not process any event."""
+    """Check that sha extractor does not publish compressed messages to topic."""
     decoded = None
     error = None
     message = kafka_util.consume_message_from_topic(context.kafka_hostname, context.outgoing_topic)