diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 31cfa99993aefd512894df390669f84fe4cf4c73..5dd93586bb4f63bd5f5cfaa37a3b987f2d99f318 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,15 @@
+2008-05-01  David Kilzer  <ddkilzer@apple.com>
+
+        Clean up configuration usage in run-webkit-tests
+
+        Reviewed by Adam.
+
+        * Scripts/run-webkit-tests: Parse configuration switches using
+        passedConfiguration() from webkitdirs.pm like every other script.
+        Note that we must still call setConfiguration() afterwards in
+        case the --configuration switch was used.  Use $configurationOption
+        when running build-dumprendertree instead of recreating the switch.
+
 2008-04-29  Adam Roben  <aroben@apple.com>
 
         Restore the beloved COMPtr::operator&
diff --git a/WebKitTools/Scripts/run-webkit-tests b/WebKitTools/Scripts/run-webkit-tests
index 59b6b1f02d3831ffecf0b53525c0512c56414fde..e4b936395c24af166d7c47626b5103cb1339b28b 100755
--- a/WebKitTools/Scripts/run-webkit-tests
+++ b/WebKitTools/Scripts/run-webkit-tests
@@ -203,9 +203,15 @@ Usage: $programName [options] [testdir|testpath ...]
   -m|--merge-leak-depth arg       Merges leak callStacks and prints the number of unique leaks beneath a callstack depth of arg.  Defaults to 5.
 EOF
 
+# Process @ARGV for configuration switches before calling GetOptions()
+if (my $passedConfiguration = passedConfiguration()) {
+    $configuration = $passedConfiguration;
+} else {
+    $configuration = configuration();
+}
+
 my $getOptionsResult = GetOptions(
     'c|configuration=s' => \$configuration,
-    'debug|devel' => sub { $configuration = "Debug" },
     'guard-malloc|g' => \$guardMalloc,
     'help' => \$showHelp,
     'horizontal-sweep|h' => \$repaintSweepHorizontally,
@@ -217,7 +223,6 @@ my $getOptionsResult = GetOptions(
     'platform=s' => \$platform,
     'port=i' => \$httpdPort,
     'quiet|q' => \$quiet,
-    'release|deploy' => sub { $configuration = "Release" },
     'repaint-tests|r' => \$repaintTests,
     'reset-results' => \$resetResults,
     'new-test-results!' => \$generateNewResults,
@@ -284,7 +289,7 @@ chdirWebKit();
 if(!defined($root)){
     # Push the parameters to build-dumprendertree as an array
     my @args;
-    push(@args, "--" . $configuration);
+    push(@args, $configurationOption);
     push(@args, "--qt")  if isQt();
     push(@args, "--gtk")  if isGtk();