diff --git a/.circleci/config.yml b/.circleci/config.yml
index 0c2013dc83..9c90465f8c 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -14,11 +14,11 @@ jobs:
 
       - run:
           name: Run Tests
-          command: ./gradlew clean check --parallel --stacktrace
+          command: GRADLE_OPTS="-Dorg.gradle.jvmargs=-Xmx1G -Xms512M" ./gradlew clean check --parallel --stacktrace --no-daemon --max-workers=3
 
       - run:
           name: Verify Version Scan
-          command: ./gradlew verifyVersionScan --parallel --stacktrace
+          command: ./gradlew verifyVersionScan --parallel --stacktrace --no-daemon
 
       - save_cache:
           paths:
@@ -58,5 +58,5 @@ jobs:
                 -PbintrayUser=${BINTRAY_USER} \
                 -PbintrayApiKey=${BINTRAY_API_KEY} \
                 -PbuildInfo.build.number=${CIRCLE_BUILD_NUM} \
-                artifactoryPublish --max-workers=1 --stacktrace
+                artifactoryPublish --max-workers=1 --stacktrace --no-daemon
             fi
diff --git a/dd-trace/src/main/java/com/datadoghq/trace/propagation/HTTPCodec.java b/dd-trace/src/main/java/com/datadoghq/trace/propagation/HTTPCodec.java
index 8eb86f6da6..42f53971ed 100644
--- a/dd-trace/src/main/java/com/datadoghq/trace/propagation/HTTPCodec.java
+++ b/dd-trace/src/main/java/com/datadoghq/trace/propagation/HTTPCodec.java
@@ -38,15 +38,16 @@ public class HTTPCodec implements Codec<TextMap> {
 
     for (final Map.Entry<String, String> entry : carrier) {
 
-      if (entry.getKey().equals(TRACE_ID_KEY)) {
+      final String key = entry.getKey().toLowerCase();
+      if (key.equalsIgnoreCase(TRACE_ID_KEY)) {
         traceId = Long.parseLong(entry.getValue());
-      } else if (entry.getKey().equals(SPAN_ID_KEY)) {
+      } else if (key.equalsIgnoreCase(SPAN_ID_KEY)) {
         spanId = Long.parseLong(entry.getValue());
-      } else if (entry.getKey().startsWith(OT_BAGGAGE_PREFIX)) {
+      } else if (key.startsWith(OT_BAGGAGE_PREFIX)) {
         if (baggage.isEmpty()) {
           baggage = new HashMap<>();
         }
-        baggage.put(entry.getKey().replace(OT_BAGGAGE_PREFIX, ""), decode(entry.getValue()));
+        baggage.put(key.replace(OT_BAGGAGE_PREFIX, ""), decode(entry.getValue()));
       }
     }
     DDSpanContext context = null;
diff --git a/dd-trace/src/test/java/com/datadoghq/trace/propagation/HTTPCodecTest.java b/dd-trace/src/test/java/com/datadoghq/trace/propagation/HTTPCodecTest.java
index cc7df43348..24764306df 100644
--- a/dd-trace/src/test/java/com/datadoghq/trace/propagation/HTTPCodecTest.java
+++ b/dd-trace/src/test/java/com/datadoghq/trace/propagation/HTTPCodecTest.java
@@ -56,10 +56,10 @@ public class HTTPCodecTest {
     final Map<String, String> actual =
         new HashMap<String, String>() {
           {
-            put(TRACE_ID_KEY, "1");
-            put(SPAN_ID_KEY, "2");
-            put(OT_BAGGAGE_PREFIX + "k1", "v1");
-            put(OT_BAGGAGE_PREFIX + "k2", "v2");
+            put(TRACE_ID_KEY.toUpperCase(), "1");
+            put(SPAN_ID_KEY.toUpperCase(), "2");
+            put(OT_BAGGAGE_PREFIX.toUpperCase() + "k1", "v1");
+            put(OT_BAGGAGE_PREFIX.toUpperCase() + "k2", "v2");
           }
         };