diff --git a/README.md b/README.md
index 9a3e4c9..b12a216 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,8 @@
 # Jekyll::Compose
 
-Streamline your writing in Jekyll with these commands.
+Streamline your writing in Jekyll with some commands.
+
+[![Build Status](https://travis-ci.org/jekyll/jekyll-compose.svg?branch=master)](https://travis-ci.org/jekyll/jekyll-compose)
 
 ## Installation
 
@@ -18,7 +20,7 @@ Or install it yourself as:
 
 ## Usage
 
-Usage instructions go here.
+Install `jekyll-compose` and run `jekyll help`.
 
 ## Contributing
 
diff --git a/Rakefile b/Rakefile
index 2995527..62b270e 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1 +1,9 @@
 require "bundler/gem_tasks"
+require 'rake/testtask'
+Rake::TestTask.new(:test) do |test|
+  test.libs << 'lib' << 'test'
+  test.pattern = 'test/**/test_*.rb'
+  test.verbose = true
+end
+
+task :default => :test
diff --git a/jekyll-compose.gemspec b/jekyll-compose.gemspec
index b3bd798..1b80a39 100644
--- a/jekyll-compose.gemspec
+++ b/jekyll-compose.gemspec
@@ -13,11 +13,12 @@ Gem::Specification.new do |spec|
   spec.homepage      = "https://github.com/jekyll/jekyll-compose"
   spec.license       = "MIT"
 
-  spec.files         = `git ls-files -z`.split("\x0")
+  spec.files         = `git ls-files -z`.split("\x0").grep(%r{(bin|lib)/})
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.5"
-  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "jekyll", "~> 2.0"
+  spec.add_development_dependency "shoulda"
 end