diff --git a/lib/travis/cli/setup/pypi.rb b/lib/travis/cli/setup/pypi.rb
index 357c6462..3b3e19f0 100644
--- a/lib/travis/cli/setup/pypi.rb
+++ b/lib/travis/cli/setup/pypi.rb
@@ -10,10 +10,10 @@ def run
           deploy 'pypi', 'release' do |config|
             config['user']     ||= ask("Username: ").to_s
             config['password'] ||= ask("Password: ") { |q| q.echo = "*" }.to_s
-
             on("release only tagged commits? ", config, 'tags' => true)
             # the default of pypi `setup.py build` is the `sdist`
-            on("deploy as wheel file too? ", config, 'distributions' => 'sdist bdist_wheel')
+            deploy_wheels = agree("deploy as wheel file too? ") { |q| q.default = 'no' }
+            config['distributions'] = 'sdist bdist_wheel' if deploy_wheels
           end
         end
       end