diff --git a/lib/rake/testtask.rb b/lib/rake/testtask.rb
index 29f546b51..cc66af845 100644
--- a/lib/rake/testtask.rb
+++ b/lib/rake/testtask.rb
@@ -159,7 +159,7 @@ def file_list_string # :nodoc:
 
     def file_list # :nodoc:
       if ENV["TEST"]
-        FileList[ENV["TEST"]]
+        FileList[ENV["TEST"].split(",")]
       else
         result = []
         result += @test_files.to_a if @test_files
diff --git a/test/test_rake_test_task.rb b/test/test_rake_test_task.rb
index b5b587410..b7ff3658f 100644
--- a/test/test_rake_test_task.rb
+++ b/test/test_rake_test_task.rb
@@ -63,6 +63,17 @@ def test_file_list_env_test
     ENV.delete "TEST"
   end
 
+  def test_file_list_env_test_multiple
+    ENV["TEST"] = "testfile.rb,othertestfile.rb"
+    tt = Rake::TestTask.new do |t|
+      t.pattern = "*"
+    end
+
+    assert_equal ["testfile.rb", "othertestfile.rb"], tt.file_list.to_a
+  ensure
+    ENV.delete "TEST"
+  end
+
   def test_libs_equals
     test_task = Rake::TestTask.new do |t|
       t.libs << ["A", "B"]