Increase several timeouts on test failures

patch by Berenguer Blasi; reviewed by Benjamin Lerer for CASSANDRA-16073
diff --git a/cql_tracing_test.py b/cql_tracing_test.py
index fa6d4b8..cb3805a 100644
--- a/cql_tracing_test.py
+++ b/cql_tracing_test.py
@@ -78,7 +78,8 @@
         out, err, _ = node1.run_cqlsh(
             "CONSISTENCY ALL; TRACING ON; "
             "INSERT INTO ks.users (userid, firstname, lastname, age) "
-            "VALUES (550e8400-e29b-41d4-a716-446655440000, 'Frodo', 'Baggins', 32)")
+            "VALUES (550e8400-e29b-41d4-a716-446655440000, 'Frodo', 'Baggins', 32)",
+            cqlsh_options=['--request-timeout', '30'])
         logger.debug(out)
         assert 'Tracing session: ' in out
 
@@ -92,7 +93,8 @@
         # Queries
         out, err, _ = node1.run_cqlsh('CONSISTENCY ALL; TRACING ON; '
                                       'SELECT firstname, lastname '
-                                      'FROM ks.users WHERE userid = 550e8400-e29b-41d4-a716-446655440000')
+                                      'FROM ks.users WHERE userid = 550e8400-e29b-41d4-a716-446655440000',
+                                      cqlsh_options=['--request-timeout', '30'])
         logger.debug(out)
         assert 'Tracing session: ' in out
 
diff --git a/dtest_setup.py b/dtest_setup.py
index 5688604..e9bb74a 100644
--- a/dtest_setup.py
+++ b/dtest_setup.py
@@ -399,7 +399,7 @@
         else:
             repaired_data_tracking_values = {}
 
-        timeout = 15000
+        timeout = 30000
         if self.cluster_options is not None and len(self.cluster_options) > 0:
             values = merge_dicts(self.cluster_options, phi_values, repaired_data_tracking_values)
         else: