diff --git a/test/api-tests.js b/test/api-tests.js
index 756baad0..33643896 100644
--- a/test/api-tests.js
+++ b/test/api-tests.js
@@ -1,25 +1,12 @@
 require(__dirname+"/test-helper");
 
 //defaults
-var client = new Client();
-assert.equal(client.user, null);
-assert.equal(client.database, null);
-assert.equal(client.port, 5432);
 
-var user = 'brian';
-var database = 'pgjstest';
 
 var client = new Client({
-  user: user,
-  database: database,
-  port: 321
+  user: 'brian',
+  database: 'pgjstest'
 });
-
-assert.equal(client.user, user);
-assert.equal(client.database, database);
-assert.equal(client.port, 321);
-
-client.port = 5432;
 client.connect();
 
 client.query('create temporary table bang (id integer)');
diff --git a/test/client-tests.js b/test/client-tests.js
new file mode 100644
index 00000000..89f8d772
--- /dev/null
+++ b/test/client-tests.js
@@ -0,0 +1,25 @@
+require(__dirname+'/test-helper');
+test('client settings', function() {
+  test('defaults', function() {
+    var client = new Client();
+    assert.equal(client.user, null);
+    assert.equal(client.database, null);
+    assert.equal(client.port, 5432);
+  });
+
+  test('custom', function() {
+    var user = 'brian';
+    var database = 'pgjstest';
+
+    var client = new Client({
+      user: user,
+      database: database,
+      port: 321
+    });
+
+    assert.equal(client.user, user);
+    assert.equal(client.database, database);
+    assert.equal(client.port, 321);
+  });
+
+});