diff --git a/redash/query_runner/cass.py b/redash/query_runner/cass.py
index b211cbe27..418e7f4cb 100644
--- a/redash/query_runner/cass.py
+++ b/redash/query_runner/cass.py
@@ -92,9 +92,11 @@ class Cassandra(BaseQueryRunner):
                                                       password='{}'.format(self.configuration.get('password', '')))
                 connection = Cluster([self.configuration.get('host', '')],
                                      auth_provider=auth_provider,
+                                     port=self.configuration.get('port', ''),
                                      protocol_version=self.configuration.get('protocol', 3))
             else:
                 connection = Cluster([self.configuration.get('host', '')],
+                                     port=self.configuration.get('port', ''),
                                      protocol_version=self.configuration.get('protocol', 3))
             session = connection.connect()
             session.set_keyspace(self.configuration['keyspace'])
diff --git a/redash/query_runner/google_spanner.py b/redash/query_runner/google_spanner.py
new file mode 100644
index 000000000..e69de29bb