diff --git a/tests/adapters/mysql_test.js b/tests/adapters/mysql_test.js
index 63f2426..bd912ce 100644
--- a/tests/adapters/mysql_test.js
+++ b/tests/adapters/mysql_test.js
@@ -33,10 +33,9 @@ testBase._setUp(qb, function(test, err, rows) {
 tests["mysql adapter with query builder"] = function(test) {
 	test.expect(1);
 	test.ok(testBase.qb);
-
+	test.done();
 	// Close the db connection
 	connection.end();
-	test.done();
 };
 
 // Export the final test object
diff --git a/tests/adapters/node-firebird_test.js b/tests/adapters/node-firebird_test.js
index 6eb6cee..78f2793 100644
--- a/tests/adapters/node-firebird_test.js
+++ b/tests/adapters/node-firebird_test.js
@@ -9,6 +9,13 @@ var config = require('../config.json')[adapterName];
 config.conn.database = __dirname + config.conn.database;
 var nodeQuery = require('../../lib/node-query');
 
+// Skip on TravisCi
+if (process.env.CI)
+{
+	module.exports = {};
+	return;
+}
+
 // Set up the connection
 try {
 	var Firebird = require(adapterName);
@@ -24,7 +31,6 @@ try {
 			// Connect to the database
 			Firebird.attach(config.conn, function(err, db) {
 				if (err) {
-					throw new Error(err);
 					console.error(err);
 				}
 				conn = db;