diff --git a/.azure-pipelines/templates/steps/tox-steps.yml b/.azure-pipelines/templates/steps/tox-steps.yml
index 23427f2b2..51684d9be 100644
--- a/.azure-pipelines/templates/steps/tox-steps.yml
+++ b/.azure-pipelines/templates/steps/tox-steps.yml
@@ -40,4 +40,7 @@ steps:
       else
         python -m tox
       fi
+    env:
+      AWS_ACCESS_KEY_ID: $(AWS_ACCESS_KEY_ID)
+      AWS_SECRET_ACCESS_KEY: $(AWS_SECRET_ACCESS_KEY)
     displayName: Run tox
diff --git a/tests/letstest/multitester.py b/tests/letstest/multitester.py
index eade6b125..504676368 100644
--- a/tests/letstest/multitester.py
+++ b/tests/letstest/multitester.py
@@ -95,8 +95,7 @@ cl_args = parser.parse_args()
 #-------------------------------------------------------------------------------
 # assumes naming: <key_filename> = <keyname>.pem
 KEYFILE = cl_args.key_file
-#KEYNAME = os.path.split(cl_args.key_file)[1].split('.pem')[0]
-KEYNAME = 'travis-test-farm'
+KEYNAME = os.path.split(cl_args.key_file)[1].split('.pem')[0]
 PROFILE = None if cl_args.aws_profile == 'SET_BY_ENV' else cl_args.aws_profile
 
 # Globals