diff --git a/tests/test_install.php b/tests/test_install.php
index 47aaef6c..86b991e5 100644
--- a/tests/test_install.php
+++ b/tests/test_install.php
@@ -1,28 +1,47 @@
 <?php
 
+$options = getopt("d:");
+$db = $options["d"];
+
 require_once('lib/simpletest/autorun.php');
 require_once('lib/simpletest/unit_tester.php');
 require_once('lib/simpletest/web_tester.php');
 require_once('lib/simpletest/reporter.php');
 
 class ShimmieSimpleTestCase extends WebTestCase {
-	var $options;
 	var $database;
+	var $db_user, $db_pass;
 	
 	function ShimmieTestCase() {
-		$this->options = getopt("d:");
-		$this->database = $this->options["d"];
+		$this->database = $db;
+		
+		if ($db === "mysql") {
+			$this->db_user = "travis";
+			$this->db_pass = "";
+		} elseif ($db === "pgsql") {
+			$this->db_user = "postgres";
+			$this->db_pass = "";
+		}
 	}
 	
 	function testOptions() {
-		print_r($this->options);
-		$this->assertNotNull($this->database);
+		echo $this->database;
+		//$this->assertFalse(is_null($this->database));
 	}
 	
 	function installShimmie()
 	{
 		$this->get('http://127.0.0.1/');
 		$this->assertResponse(200);
+		$this->assertTitle("Shimmie Installation");
+		$this->assertText("Database Install");
+		
+		$this->setFieldById("database_type", $this->database);
+		$this->assertFieldByName("database_host", "localhost");
+		$this->setFieldByName("database_user", $this->db_user);
+		$this->setFieldByName("database_password", $this->db_pass);
+		$this->assertFieldByName("database_name", "shimmie");
+		
 	}
 	
 }