diff --git a/lib/fog/compute/models/aws/server.rb b/lib/fog/compute/models/aws/server.rb
index 0a474fcc7..ebaf1c9f2 100644
--- a/lib/fog/compute/models/aws/server.rb
+++ b/lib/fog/compute/models/aws/server.rb
@@ -200,7 +200,7 @@ module Fog
           Fog::SSH.new(public_ip_address, username, options).run(commands)
         end
 
-        def scp(local_path, remote_path, scp_options = nil)
+        def scp(local_path, remote_path, scp_options = {})
           requires :public_ip_address, :username
 
           options = {}
diff --git a/lib/fog/compute/models/bluebox/server.rb b/lib/fog/compute/models/bluebox/server.rb
index 8d9a117ef..05e02baeb 100644
--- a/lib/fog/compute/models/bluebox/server.rb
+++ b/lib/fog/compute/models/bluebox/server.rb
@@ -128,7 +128,7 @@ module Fog
           Fog::SSH.new(ips.first['address'], username, options).run(commands)
         end
 
-        def scp(local_path, remote_path, scp_options = nil)
+        def scp(local_path, remote_path, scp_options = {})
           requires :ips, :username
 
           options = {}
diff --git a/lib/fog/compute/models/go_grid/server.rb b/lib/fog/compute/models/go_grid/server.rb
index 8acc693ee..172219dc9 100644
--- a/lib/fog/compute/models/go_grid/server.rb
+++ b/lib/fog/compute/models/go_grid/server.rb
@@ -78,7 +78,7 @@ module Fog
           Fog::SSH.new(ip['ip'], username, options).run(commands)
         end
 
-        def scp(local_path, remote_path, scp_options = nil)
+        def scp(local_path, remote_path, scp_options = {})
           requires :ip, :username
 
           options = {}
diff --git a/lib/fog/compute/models/rackspace/server.rb b/lib/fog/compute/models/rackspace/server.rb
index 29d72b6f5..d8910915b 100644
--- a/lib/fog/compute/models/rackspace/server.rb
+++ b/lib/fog/compute/models/rackspace/server.rb
@@ -120,7 +120,7 @@ module Fog
           Fog::SSH.new(public_ip_address, username, options).run(commands)
         end
 
-        def scp(local_path, remote_path, scp_options = nil)
+        def scp(local_path, remote_path, scp_options = {})
           requires :public_ip_address, :username
 
           options = {}
diff --git a/lib/fog/compute/models/slicehost/server.rb b/lib/fog/compute/models/slicehost/server.rb
index d9984cd2e..94c9303f5 100644
--- a/lib/fog/compute/models/slicehost/server.rb
+++ b/lib/fog/compute/models/slicehost/server.rb
@@ -110,7 +110,7 @@ module Fog
           Fog::SSH.new(addresses.first, username, options).run(commands)
         end
 
-        def scp(local_path, remote_path, scp_options = nil)
+        def scp(local_path, remote_path, scp_options = {})
           requires :addresses, :username
 
           options = {}
diff --git a/lib/fog/compute/models/virtual_box/server.rb b/lib/fog/compute/models/virtual_box/server.rb
index 2d0331bae..2d2c4233b 100644
--- a/lib/fog/compute/models/virtual_box/server.rb
+++ b/lib/fog/compute/models/virtual_box/server.rb
@@ -151,7 +151,7 @@ module Fog
           end
         end
 
-        def scp(local_path, remote_path, scp_options = nil)
+        def scp(local_path, remote_path, scp_options = {})
           raise 'Not Implemented'
           # requires :addresses, :username
           #
diff --git a/lib/fog/core/scp.rb b/lib/fog/core/scp.rb
index ae96c9e6c..53137a7e2 100644
--- a/lib/fog/core/scp.rb
+++ b/lib/fog/core/scp.rb
@@ -45,7 +45,7 @@ module Fog
         @options  = { :paranoid => false }.merge(options)
       end
 
-      def upload(local_path, remote_path, scp_options = nil)
+      def upload(local_path, remote_path, scp_options = {})
         begin
           Net::SCP.start(@address, @username, @options) do |scp|
             scp.upload!(local_path, remote_path, scp_options) do |ch, name, sent, total|