diff --git a/redash/query_runner/athena.py b/redash/query_runner/athena.py
index 8d4f3dfcff..d9d2736531 100644
--- a/redash/query_runner/athena.py
+++ b/redash/query_runner/athena.py
@@ -78,9 +78,14 @@ def configuration_schema(cls):
                     'type': 'boolean',
                     'title': 'Use Glue Data Catalog',
                 },
+                'work_group': {
+                    'type': 'string',
+                    'title': 'Athena Work Group',
+                    'default': 'primary'
+                },
             },
             'required': ['region', 's3_staging_dir'],
-            'order': ['region', 'aws_access_key', 'aws_secret_key', 's3_staging_dir', 'schema'],
+            'order': ['region', 'aws_access_key', 'aws_secret_key', 's3_staging_dir', 'schema', 'work_group'],
             'secret': ['aws_secret_key']
         }
 
@@ -170,6 +175,7 @@ def run_query(self, query, user):
             schema_name=self.configuration.get('schema', 'default'),
             encryption_option=self.configuration.get('encryption_option', None),
             kms_key=self.configuration.get('kms_key', None),
+            work_group=self.configuration.get('work_group', 'primary'),
             formatter=SimpleFormatter()).cursor()
 
         try:
diff --git a/requirements_all_ds.txt b/requirements_all_ds.txt
index adfbd171bd..4f7a49cae0 100644
--- a/requirements_all_ds.txt
+++ b/requirements_all_ds.txt
@@ -11,8 +11,8 @@ td-client==0.8.0
 pymssql==2.1.3
 dql==0.5.24
 dynamo3==0.4.7
-boto3==1.9.85
-botocore==1.12.85
+boto3==1.9.115
+botocore==1.12.115
 sasl>=0.1.3
 thrift>=0.8.0
 thrift_sasl>=0.1.0
@@ -20,7 +20,7 @@ cassandra-driver==3.11.0
 memsql==2.16.0
 atsd_client==2.0.12
 simple_salesforce==0.72.2
-PyAthena>=1.0.0
+PyAthena>=1.5.0
 pymapd==0.7.1
 qds-sdk>=1.9.6
 ibm-db>=2.0.9