diff --git a/Rakefile b/Rakefile
index d433a1e..37fe42a 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,10 +1,28 @@
 require "bundler/gem_tasks"
 require "rake/testtask"
+require 'rubocop/rake_task'
 
-Rake::TestTask.new(:test) do |t|
-  t.libs << "test"
-  t.libs << "lib"
-  t.test_files = FileList["test/**/*_test.rb"]
+# Add additional test suite definitions to the default test task here
+namespace :spec do
+  desc 'Runs RuboCop on specified directories'
+  RuboCop::RakeTask.new(:rubocop) do |task|
+    # Dirs: app, lib, test
+    task.patterns = ['exe/**/*.rb', 'lib/**/*.rb', 'spec/**/*_spec.rb']
+
+    # Make it easier to disable cops.
+    task.options << "--display-cop-names"
+
+    # Abort on failures (fix your code first)
+    task.fail_on_error = true
+  end
 end
 
-task :default => :test
+Rake::TestTask.new(:spec) do |t|
+  t.libs << "spec"
+  t.libs << "lib"
+  t.test_files = FileList['spec/**/*_spec.rb']
+end
+
+# Rake::Task[:spec].enhance ['spec:rubocop']
+
+task :default => :spec
diff --git a/data/test.txt b/spec/files/test.txt
similarity index 100%
rename from data/test.txt
rename to spec/files/test.txt
diff --git a/data/test2.txt b/spec/files/test2.txt
similarity index 100%
rename from data/test2.txt
rename to spec/files/test2.txt
diff --git a/data/test3.txt b/spec/files/test3.txt
similarity index 100%
rename from data/test3.txt
rename to spec/files/test3.txt
diff --git a/data/test4.txt b/spec/files/test4.txt
similarity index 100%
rename from data/test4.txt
rename to spec/files/test4.txt
diff --git a/test/mm2ep_depend_test.rb b/spec/mm2ep_depend_test.rb
similarity index 100%
rename from test/mm2ep_depend_test.rb
rename to spec/mm2ep_depend_test.rb
diff --git a/test/test_helper.rb b/spec/test_helper.rb
similarity index 100%
rename from test/test_helper.rb
rename to spec/test_helper.rb