1 files changed, 11 insertions, 4 deletions
diff --git a/test/runner.rb b/test/runner.rb
index 0295260ba0..fcbd151654 100644
--- a/test/runner.rb
+++ b/test/runner.rb
@@ -6,15 +6,22 @@ rcsid = %w$Id$
 Version = rcsid[2].scan(/\d+/).collect!(&method(:Integer)).freeze
 Release = rcsid[3].freeze
 
-# not sure why these are needed now... but whatever
-$:.push(*Dir["test/*"].find_all { |path| File.directory? path })
-
 class Module
   def tu_deprecation_warning old, new = nil, kaller = nil
     # stfu - for now...
   end
 end
 
-(Dir["test/test_*.rb"] + Dir["test/**/test_*.rb"]).each do |test|
+test_dir = File.dirname(__FILE__)
+
+# not sure why these are needed now... but whatever
+$:.push(*Dir[File.join(test_dir, '*')].find_all { |path| File.directory? path })
+
+test_files = (Dir[File.join(test_dir, "test_*.rb")] +
+              Dir[File.join(test_dir, "**/test_*.rb")])
+
+test_files = test_files.grep(Regexp.union(*ARGV)) unless ARGV.empty?
+
+test_files.each do |test|
   require test
 end