diff --git a/lib/fog/compute/models/aws/key_pair.rb b/lib/fog/compute/models/aws/key_pair.rb
index c84590f7b..26fd14498 100644
--- a/lib/fog/compute/models/aws/key_pair.rb
+++ b/lib/fog/compute/models/aws/key_pair.rb
@@ -46,10 +46,11 @@ module Fog
           end
         end
 
-        private
-          def writable?
-            !!private_key
-          end
+        def writable?
+          !!private_key
+        end
+
+          private
       end
 
     end
diff --git a/tests/compute/models/aws/key_pair_tests.rb b/tests/compute/models/aws/key_pair_tests.rb
index 1f70f8477..c330fe156 100644
--- a/tests/compute/models/aws/key_pair_tests.rb
+++ b/tests/compute/models/aws/key_pair_tests.rb
@@ -2,4 +2,26 @@ Shindo.tests("AWS::Compute | key_pair", ['aws']) do
 
   model_tests(AWS[:compute].key_pairs, {:name => 'fogkeyname'}, true)
 
+  after do
+    @keypair.destroy
+  end
+
+  tests("new keypair") do
+    @keypair = AWS[:compute].key_pairs.create(:name => 'testkey')
+
+    test ("writable?") do
+      @keypair.writable? == true
+    end
+  end
+
+  tests("existing keypair") do
+    AWS[:compute].key_pairs.create(:name => 'testkey')
+    @keypair = AWS[:compute].key_pairs.get('testkey')
+
+    test("writable?") do
+      @keypair.writable? == false
+    end
+  end
+
+
 end