diff --git a/awsagentprovider/src/test/java/software/amazon/opentelemetry/javaagent/providers/AwsMetricAttributeGeneratorTest.java b/awsagentprovider/src/test/java/software/amazon/opentelemetry/javaagent/providers/AwsMetricAttributeGeneratorTest.java
index 9759753791..594d3f7dc9 100644
--- a/awsagentprovider/src/test/java/software/amazon/opentelemetry/javaagent/providers/AwsMetricAttributeGeneratorTest.java
+++ b/awsagentprovider/src/test/java/software/amazon/opentelemetry/javaagent/providers/AwsMetricAttributeGeneratorTest.java
@@ -632,6 +632,19 @@ public void testGetDBStatementRemoteOperation() {
     mockAttribute(DB_STATEMENT, "SELECT FROM *");
     mockAttribute(DB_OPERATION, "DB operation");
     validateExpectedRemoteAttributes("DB system", "DB operation");
+
+    // Case 10: Duplicate of case 1 with leading whitespace
+    mockAttribute(DB_SYSTEM, "DB system");
+    mockAttribute(DB_STATEMENT, "    SELECT DB statement");
+    mockAttribute(DB_OPERATION, null);
+    validateExpectedRemoteAttributes("DB system", "SELECT");
+
+    // Case 11: Duplicate of case 2 with leading whitespace. Test if whitespace affects longest
+    // match
+    mockAttribute(DB_SYSTEM, "DB system");
+    mockAttribute(DB_STATEMENT, "     DROP VIEW DB statement");
+    mockAttribute(DB_OPERATION, null);
+    validateExpectedRemoteAttributes("DB system", "DROP VIEW");
   }
 
   @Test