diff --git a/.travis.yml b/.travis.yml
index 10e07dae9..00a0371e9 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -36,14 +36,11 @@ jobs:
   - stage: test
     env: GEMSETS="test sidekiq"
     rvm: 2.4.1
-
-before_deploy:
-- gem update --system 2.6.14
-- gem --version
-- gem install bundler -v 1.12
-- bundle _1.12.0_ --version
-- bundle _1.12.0_ install --with "$GEMSETS" --binstubs
-- bundle exec rake rdoc
+  - stage: deploy
+    env: GEMSETS="test doc"
+    rvm: 2.4.1
+    script: bundle exec rake rdoc
+    if: tag =~ ^v[1-9]
 
 deploy:
   provider: pages
diff --git a/Gemfile b/Gemfile
index c2c3179ea..8b544493c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -20,4 +20,8 @@ group :sidekiq, optional: true do
     gem 'sidekiq', '~> 5.0.4'
 end
 
+group :doc, optional: true do
+  gem 'hanna-nouveau'
+end
+
 gemspec
diff --git a/bugsnag.gemspec b/bugsnag.gemspec
index e09e9c4b7..bc2375358 100644
--- a/bugsnag.gemspec
+++ b/bugsnag.gemspec
@@ -19,5 +19,4 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
   s.required_ruby_version = '>= 1.9.2'
   s.add_runtime_dependency 'concurrent-ruby', '~> 1.0'
-  s.add_development_dependency 'hanna-nouveau'
 end