diff --git a/.travis.yml b/.travis.yml
index 2061ee66..1c463402 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,7 +16,7 @@ before_script:
   - if [[ "$DB" == "mysql" ]]; then mysql -e "create database shimmie;" -uroot; fi
   - chmod -R 777 .
 
-script: php tests/simple_test.php -database $DB -url http://127.0.0.1/
+script: php tests/simple_test.php -d $DB -u http://127.0.0.1/
 
 # configure notifications (email, IRC, campfire etc)
 #notifications:
diff --git a/tests/simple_test.php b/tests/simple_test.php
index 777d2c5a..65d785ba 100644
--- a/tests/simple_test.php
+++ b/tests/simple_test.php
@@ -4,12 +4,12 @@ require_once('lib/simpletest/autorun.php');
 require_once('lib/simpletest/unit_tester.php');
 require_once('lib/simpletest/reporter.php');
 
-class ShimmieTestCase extends UnitTestCase {
+class ShimmieSimpleTestCase extends UnitTestCase {
 	
 	var $options;
 	
 	function ShimmieTestCase() {
-		$this->options = getopt("database:url:"); 
+		$this->options = getopt("d:u:"); 
 	}
 	
 	function testOptions() {