diff --git a/tests/test-265mkvinfo_clusters_with_unknown_size.rb b/tests/test-265mkvinfo_clusters_with_unknown_size.rb
old mode 100644
new mode 100755
index e0f33e248..d0d59506a
--- a/tests/test-265mkvinfo_clusters_with_unknown_size.rb
+++ b/tests/test-265mkvinfo_clusters_with_unknown_size.rb
@@ -1,13 +1,4 @@
 #!/usr/bin/ruby -w
 
-class T_265mkvinfo_clusters_with_unknown_size < Test
-  def description
-    return "mkvinfo / Clusters with an unknown size"
-  end
-
-  def run
-    sys "../src/mkvinfo -v -v -z --ui-language en_US data/webm/live-stream.webm > #{tmp}"
-    return hash_tmp
-  end
-end
-
+describe "mkvinfo / Clusters with an unknown size"
+test_info "data/webm/live-stream.webm", :args => "-v -v -z"
diff --git a/tests/test.d/simple_test.rb b/tests/test.d/simple_test.rb
index a5e36afe9..38a253f76 100644
--- a/tests/test.d/simple_test.rb
+++ b/tests/test.d/simple_test.rb
@@ -133,6 +133,20 @@ class SimpleTest
     }
   end
 
+  def test_info file, *args
+    options             = args.extract_options!
+    full_command_line   = [ options[:args], file ].flatten.join(' ')
+    options[:name]    ||= full_command_line
+    @blocks[:tests] << {
+      :name  => full_command_line,
+      :block => lambda {
+        output = options[:output] || tmp
+        info full_command_line, :exit_code => options[:exit_code], :output => output
+        options[:keep_tmp] ? hash_file(output) : hash_tmp
+      },
+    }
+  end
+
   def test_merge_unsupported file, *args
     options             = args.extract_options!
     full_command_line   = [ options[:args], file ].flatten.join(' ')