diff --git a/Appraisals b/Appraisals
index 1e00ccc..efcc820 100644
--- a/Appraisals
+++ b/Appraisals
@@ -2,12 +2,7 @@ appraise 'jekyll-v2' do
   gem 'jekyll', '~> 2.5'
 end
 
-appraise 'jekyll-v3_1_3' do
-  gem 'jekyll', '3.1.3'
-  gem 'jekyll-paginate', '~> 1.1.0'
-end
-
-appraise 'jekyll-v3_1_6' do
-  gem 'jekyll', '3.1.6'
+appraise 'jekyll-v3' do
+  gem 'jekyll', '~> 3.0'
   gem 'jekyll-paginate', '~> 1.1.0'
 end
diff --git a/Guardfile_jekyllv3_1_3 b/Guardfile_jekyllv3
similarity index 62%
rename from Guardfile_jekyllv3_1_3
rename to Guardfile_jekyllv3
index ed42acf..0a30c42 100644
--- a/Guardfile_jekyllv3_1_3
+++ b/Guardfile_jekyllv3
@@ -1,4 +1,4 @@
-guard :rspec, cmd: 'appraisal jekyll-v3_1_3 bundle exec rspec --color --format documentation' do
+guard :rspec, cmd: 'appraisal jekyll-v3 bundle exec rspec --color --format documentation' do
   watch(%r{^spec/.+_spec\.rb$})
   watch(%r{^lib/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }
   watch('spec/spec_helper.rb')  { 'spec' }
diff --git a/Guardfile_jekyllv3_1_6 b/Guardfile_jekyllv3_1_6
deleted file mode 100644
index c4f19c6..0000000
--- a/Guardfile_jekyllv3_1_6
+++ /dev/null
@@ -1,7 +0,0 @@
-guard :rspec, cmd: 'appraisal jekyll-v3_1_6 bundle exec rspec --color --format documentation' do
-  watch(%r{^spec/.+_spec\.rb$})
-  watch(%r{^lib/(.+)\.rb$})     { |m| "spec/#{m[1]}_spec.rb" }
-  watch('spec/spec_helper.rb')  { 'spec' }
-end
-
-notification :off
diff --git a/scripts/test b/scripts/test
index b7d50df..03af8f5 100755
--- a/scripts/test
+++ b/scripts/test
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 cd "$(dirname "$BASH_SOURCE")"
 
-./test_v2 && ./test_v3_1_3 && ./test_v3_1_6
+./test_v2 && ./test_v3
diff --git a/scripts/test_v3 b/scripts/test_v3
new file mode 100755
index 0000000..a68f459
--- /dev/null
+++ b/scripts/test_v3
@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+cd "$(dirname "$BASH_SOURCE")"/..
+
+echo "Testing under Jekyll 3"
+COVERAGE=1 appraisal jekyll-v3 bundle exec rspec
+
diff --git a/scripts/test_v3_1_3 b/scripts/test_v3_1_3
deleted file mode 100755
index 1e3c7d6..0000000
--- a/scripts/test_v3_1_3
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-cd "$(dirname "$BASH_SOURCE")"/..
-
-echo "Testing under Jekyll 3.1.3"
-COVERAGE=1 appraisal jekyll-v3_1_3 bundle exec rspec
-
diff --git a/scripts/test_v3_1_6 b/scripts/test_v3_1_6
deleted file mode 100755
index 82ffd38..0000000
--- a/scripts/test_v3_1_6
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-cd "$(dirname "$BASH_SOURCE")"/..
-
-echo "Testing under Jekyll 3.1.6"
-COVERAGE=1 appraisal jekyll-v3_1_6 bundle exec rspec
-
diff --git a/scripts/watch_v3_1_3 b/scripts/watch_v3
similarity index 56%
rename from scripts/watch_v3_1_3
rename to scripts/watch_v3
index eceb8dd..3ccc4ad 100755
--- a/scripts/watch_v3_1_3
+++ b/scripts/watch_v3
@@ -1,4 +1,4 @@
 #!/usr/bin/env bash
 cd "$(dirname "$BASH_SOURCE")"/..
-guard --guardfile ./Guardfile_jekyllv3_1_3
+guard --guardfile ./Guardfile_jekyllv3
 
diff --git a/scripts/watch_v3_1_6 b/scripts/watch_v3_1_6
deleted file mode 100755
index 8499491..0000000
--- a/scripts/watch_v3_1_6
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-cd "$(dirname "$BASH_SOURCE")"/..
-guard --guardfile ./Guardfile_jekyllv3_1_6
-