diff --git a/superset/templates/superset/models/database/macros.html b/superset/templates/superset/models/database/macros.html
index 32972bc6508b9..da895b353772a 100644
--- a/superset/templates/superset/models/database/macros.html
+++ b/superset/templates/superset/models/database/macros.html
@@ -1,7 +1,7 @@
 {% macro testconn() %}
   <script>
     $("#sqlalchemy_uri").parent()
-      .append('<button id="testconn" class="btn">{{ _("Test Connection") }}</button>');
+      .append('<button id="testconn" class="btn btn-sm btn-primary">{{ _("Test Connection") }}</button>');
     $("#testconn").click(function(e) {
       e.preventDefault();
       var url = "/superset/testconn";
diff --git a/superset/views/core.py b/superset/views/core.py
index 1e022925ec43d..fc9e366bf19b4 100755
--- a/superset/views/core.py
+++ b/superset/views/core.py
@@ -1701,16 +1701,16 @@ def testconn(self):
                                                                   username),
                 )
 
-            connect_args = (
+            engine_params = (
                 request.json
                 .get('extras', {})
-                .get('engine_params', {})
-                .get('connect_args', {}))
+                .get('engine_params', {}))
+            connect_args = engine_params.get('connect_args')
 
             if configuration:
                 connect_args['configuration'] = configuration
 
-            engine = create_engine(uri, connect_args=connect_args)
+            engine = create_engine(uri, **engine_params)
             engine.connect()
             return json_success(json.dumps(engine.table_names(), indent=4))
         except Exception as e: