diff --git a/test/tap/tests/kill_connection2-t.cpp b/test/tap/tests/kill_connection2-t.cpp
index 1e6f0d947..06d6150fa 100644
--- a/test/tap/tests/kill_connection2-t.cpp
+++ b/test/tap/tests/kill_connection2-t.cpp
@@ -201,7 +201,7 @@ int main(int argc, char** argv) {
 for (auto& conn : conns) {
 		MYSQL * mysql = conn;
 		int rc = run_q(mysql, "DO 1");
-		ok(rc != 0, (rc == 0 ? "Connection still alive" : "Connection killed"));
+		ok(rc == 0, (rc == 0 ? "Connection still alive" : "Connection killed"));
 	}
 
 	diag("Sleeping for 12 seconds");
diff --git a/test/tap/tests/max_connections_ff-t.cpp b/test/tap/tests/max_connections_ff-t.cpp
index aa99e7f8b..522f5dcf4 100644
--- a/test/tap/tests/max_connections_ff-t.cpp
+++ b/test/tap/tests/max_connections_ff-t.cpp
@@ -408,13 +408,13 @@ int test_ff_sess_exceeds_max_conns(const CommandLine& cl, MYSQL* proxy_admin, lo
 		hrc::time_point end = hrc::now();
 
 		duration = end - start;
-		double duration_s = static_cast<int>(duration.count()) / pow(10,9);
+		double duration_s = static_cast<double>(duration.count()) / pow(10,9);
 
 		diag("Query completed - Error: %d, ErrMsg: %s", m_errno, m_error);
 		diag("Time waited: %lf seconds", duration_s);
 
-		const double srv_conn_to_s = static_cast<int>(connect_timeout) / 1000.0;
-		const double poll_to_s = static_cast<int>(poll_timeout) / 1000.0;
+		const double srv_conn_to_s = connect_timeout / 1000.0;
+		const double poll_to_s = poll_timeout / 1000.0;
 		const double grace = 500 / 1000.0;
 
 		ok(