diff --git a/Guardfile b/Guardfile
new file mode 100644
index 0000000..8e076b5
--- /dev/null
+++ b/Guardfile
@@ -0,0 +1,6 @@
+
+
+guard 'rspec', :version => 2, :cli => '-c' do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }
+end
diff --git a/Rakefile b/Rakefile
new file mode 100644
index 0000000..86f263e
--- /dev/null
+++ b/Rakefile
@@ -0,0 +1,6 @@
+require 'rspec/core/rake_task'
+
+RSpec::Core::RakeTask.new(:spec)
+
+task :default => :spec
+
diff --git a/iterm_window.gemspec b/iterm_window.gemspec
index ad1bd20..0181946 100644
--- a/iterm_window.gemspec
+++ b/iterm_window.gemspec
@@ -9,4 +9,6 @@ Gem::Specification.new do |s|
   s.files = ['README.rdoc', 'LICENSE', 'lib/iterm_window.rb']
   s.require_paths = ["lib"]
   s.has_rdoc = true
+
+  s.add_development_dependency 'rspec', '~> 2.6.0'
 end
diff --git a/spec/iterm_window_spec.rb b/spec/iterm_window_spec.rb
index c976e36..0dad55b 100644
--- a/spec/iterm_window_spec.rb
+++ b/spec/iterm_window_spec.rb
@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'iterm_window'
 
 describe ItermWindow do
   before(:each) do
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index dd2b879..e69de29 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,2 +0,0 @@
-require 'spec'
-require File.join(File.dirname(__FILE__), '..', 'lib', 'iterm_window.rb')
\ No newline at end of file