diff --git a/test/test_new_command.rb b/test/test_new_command.rb
new file mode 100644
index 00000000..2532bea8
--- /dev/null
+++ b/test/test_new_command.rb
@@ -0,0 +1,104 @@
+require 'helper'
+require 'jekyll/commands/new'
+
+class TestNewCommand < Test::Unit::TestCase
+  def dir_contents(path)
+    Dir["#{path}/**/*"].each do |file|
+      file.gsub! path, ''
+    end
+  end
+
+  def site_template
+    File.expand_path("../lib/site_template", File.dirname(__FILE__))
+  end
+
+  context 'when args contains a path' do
+    setup do
+      @path = 'new-site'
+      @args = [@path]
+      @full_path = File.expand_path(@path, Dir.pwd)
+    end
+
+    teardown do
+      FileUtils.rm_r @full_path
+    end
+
+    should 'create a new directory' do
+      assert !File.exists?(@full_path)
+      capture_stdout { Jekyll::Commands::New.process(@args) }
+      assert File.exists?(@full_path)
+    end
+
+    should 'display a success message' do
+      output = capture_stdout { Jekyll::Commands::New.process(@args) }
+      success_message = "New jekyll site installed in #{@full_path}.\n"
+      assert_equal success_message, output
+    end
+
+    should 'copy the static files in site template to the new directory' do
+      static_template_files = dir_contents(site_template).reject do |f|
+        File.extname(f) == '.erb'
+      end
+
+      capture_stdout { Jekyll::Commands::New.process(@args) }
+
+      new_site_files = dir_contents(@full_path).select do |f|
+        static_template_files.include? f
+      end
+
+      assert_same_elements static_template_files, new_site_files
+    end
+
+    should 'process any ERB files' do
+      erb_template_files = dir_contents(site_template).select do |f|
+        File.extname(f) == '.erb'
+      end
+
+      stubbed_date = '2013-01-01'
+      stub.instance_of(Time).strftime { stubbed_date }
+
+      erb_template_files.each do |f|
+        f.chomp! '.erb'
+        f.gsub! '0000-00-00', stubbed_date
+      end
+
+      capture_stdout { Jekyll::Commands::New.process(@args) }
+
+      new_site_files = dir_contents(@full_path).select do |f|
+        erb_template_files.include? f
+      end
+
+      assert_same_elements erb_template_files, new_site_files
+    end
+  end
+
+  context 'when multiple args are given' do
+    setup do
+      @site_name_with_spaces = 'new site name'
+      @multiple_args = @site_name_with_spaces.split
+    end
+
+    teardown do
+      FileUtils.rm_r File.expand_path(@site_name_with_spaces, Dir.pwd)
+    end
+
+    should 'create a new directory' do
+      assert !File.exists?(@site_name_with_spaces)
+      capture_stdout { Jekyll::Commands::New.process(@multiple_args) }
+      assert File.exists?(@site_name_with_spaces)
+    end
+  end
+
+  context 'when no args are given' do
+    setup do
+      @empty_args = []
+    end
+
+    should 'raise an ArgumentError' do
+      exception = assert_raise ArgumentError do
+        Jekyll::Commands::New.process(@empty_args)
+      end
+      assert_equal 'You must specify a path.', exception.message
+    end
+  end
+end