diff --git a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/runtimeapi/NativeClient.java b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/runtimeapi/NativeClient.java
index f3cda8bc..b4c78547 100644
--- a/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/runtimeapi/NativeClient.java
+++ b/aws-lambda-java-runtime-interface-client/src/main/java/com/amazonaws/services/lambda/runtime/api/client/runtimeapi/NativeClient.java
@@ -38,9 +38,10 @@ class NativeClient {
                 System.exit(-1);
             }
             String userAgent = String.format(
-                    "aws-lambda-java/%s-%s" ,
+                    "%s/%s-%s",
+                    System.getProperty("AWS_LAMBDA_RUNTIME_CLIENT_NAME_OVERRIDE", "aws-lambda-java"),
                     System.getProperty("java.vendor.version"),
-                    NativeClient.class.getPackage().getImplementationVersion());
+                    System.getProperty("AWS_LAMBDA_RUNTIME_CLIENT_VERSION_OVERRIDE", NativeClient.class.getPackage().getImplementationVersion()));
             initializeClient(userAgent.getBytes());
     }