diff --git a/.gitignore b/.gitignore
index f33f35de7..5285f9a61 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,5 @@
 *.sqlite*
 /var/tmp/
 /var/log/metacpan.*
+/t/var/tmp/
 /etc/metacpan_local.pl
diff --git a/lib/MetaCPAN/Plack/File.pm b/lib/MetaCPAN/Plack/File.pm
index c9dfabd9f..1b0c8f6f9 100644
--- a/lib/MetaCPAN/Plack/File.pm
+++ b/lib/MetaCPAN/Plack/File.pm
@@ -47,9 +47,14 @@ sub handle {
                                              join( "/", @args ) );
         $env->{PATH_INFO} = join("/", $index, $digest );
         return $self->get_source($env);
-    }elsif(@args == 2) {
-        return $self->get_first_result($env);
     }
+    # disabled for now because /MOO/abc/abc.t can either be the file
+    # abc.t in release abc of author MOO or the file abc/abc.t
+    # in the latest MOO release
+    #
+    # elsif(@args == 2) {
+    #     return $self->get_first_result($env);
+    # }
 }
 
 1;
diff --git a/lib/MetaCPAN/Script/Server.pm b/lib/MetaCPAN/Script/Server.pm
index 4139bf6a4..6ff02124b 100644
--- a/lib/MetaCPAN/Script/Server.pm
+++ b/lib/MetaCPAN/Script/Server.pm
@@ -39,8 +39,7 @@ sub run {
     my $runner = Plack::Runner->new;
     shift @ARGV;
 
-    #$runner->parse_options(qw(-r -R .));
-    $runner->set_options( port => $self->port );
+    $runner->parse_options(@{$self->extra_argv});
     $runner->run( $self->build_app );
 }