diff --git a/apis/openstack-nova-ec2/src/test/java/org/jclouds/openstack/nova/ec2/services/NovaEC2KeyPairClientExpectTest.java b/apis/openstack-nova-ec2/src/test/java/org/jclouds/openstack/nova/ec2/services/NovaEC2KeyPairClientExpectTest.java
index 9f44d213a0..43df5d0de4 100644
--- a/apis/openstack-nova-ec2/src/test/java/org/jclouds/openstack/nova/ec2/services/NovaEC2KeyPairClientExpectTest.java
+++ b/apis/openstack-nova-ec2/src/test/java/org/jclouds/openstack/nova/ec2/services/NovaEC2KeyPairClientExpectTest.java
@@ -1,3 +1,21 @@
+/**
+ * Licensed to jclouds, Inc. (jclouds) under one or more
+ * contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  jclouds licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
 package org.jclouds.openstack.nova.ec2.services;
 
 import static org.testng.Assert.assertEquals;
@@ -8,6 +26,8 @@ import org.jclouds.ec2.domain.KeyPair;
 import org.jclouds.http.HttpRequest;
 import org.jclouds.http.HttpResponse;
 import org.jclouds.openstack.nova.ec2.internal.BaseNovaEC2RestClientExpectTest;
+import org.jclouds.rest.ResourceNotFoundException;
+import org.testng.annotations.Test;
 
 import com.google.common.collect.ImmutableMultimap;
 
@@ -26,10 +46,39 @@ public class NovaEC2KeyPairClientExpectTest extends BaseNovaEC2RestClientExpectT
                   .payload(payloadFromStringWithContentType("Action=ImportKeyPair&KeyName=mykey&PublicKeyMaterial=c3NoLXJzYSBBQQ%3D%3D&Signature=wOOKOlDfJezRkx7NKcyOyaBQuY7PoVE3HFa9495RL7s%3D&SignatureMethod=HmacSHA256&SignatureVersion=2&Timestamp=2012-04-16T15%3A54%3A08.897Z&Version=2009-04-04&AWSAccessKeyId=identity", "application/x-www-form-urlencoded")).build(),
             HttpResponse.builder().statusCode(200).payload(payloadFromResource("/nova_ec2_import_keypair_response.xml")).build()
       ).getKeyPairServices();
-      
+
       KeyPair result = client.importKeyPairInRegion(null, "mykey", "ssh-rsa AA");
       assertEquals(result.getKeyName(), "aplowe-nova-ec22");
       assertEquals(result.getSha1OfPrivateKey(), "e3:fd:de:f6:4c:36:7d:9b:8f:2f:4c:20:f8:ae:b0:ea");
    }
 
-}
+   @Test(expectedExceptions = ResourceNotFoundException.class)
+   public void testImportKeyPairFailsNotFound() {
+      NovaEC2KeyPairClient client = requestsSendResponses(
+            describeAvailabilityZonesRequest,
+            describeAvailabilityZonesResponse,
+            HttpRequest.builder().method("POST")
+                  .endpoint(URI.create("http://localhost:8773/services/Cloud/"))
+                  .headers(ImmutableMultimap.of("Host", "localhost:8773"))
+                  .payload(payloadFromStringWithContentType("Action=ImportKeyPair&KeyName=mykey&PublicKeyMaterial=c3NoLXJzYSBBQQ%3D%3D&Signature=wOOKOlDfJezRkx7NKcyOyaBQuY7PoVE3HFa9495RL7s%3D&SignatureMethod=HmacSHA256&SignatureVersion=2&Timestamp=2012-04-16T15%3A54%3A08.897Z&Version=2009-04-04&AWSAccessKeyId=identity", "application/x-www-form-urlencoded")).build(),
+            HttpResponse.builder().statusCode(404).build()
+      ).getKeyPairServices();
+
+      client.importKeyPairInRegion(null, "mykey", "ssh-rsa AA");
+   }
+
+   @Test(expectedExceptions = IllegalStateException.class)
+   public void testImportKeyPairFailsAlreadyExists() {
+      NovaEC2KeyPairClient client = requestsSendResponses(
+            describeAvailabilityZonesRequest,
+            describeAvailabilityZonesResponse,
+            HttpRequest.builder().method("POST")
+                  .endpoint(URI.create("http://localhost:8773/services/Cloud/"))
+                  .headers(ImmutableMultimap.of("Host", "localhost:8773"))
+                  .payload(payloadFromStringWithContentType("Action=ImportKeyPair&KeyName=mykey&PublicKeyMaterial=c3NoLXJzYSBBQQ%3D%3D&Signature=wOOKOlDfJezRkx7NKcyOyaBQuY7PoVE3HFa9495RL7s%3D&SignatureMethod=HmacSHA256&SignatureVersion=2&Timestamp=2012-04-16T15%3A54%3A08.897Z&Version=2009-04-04&AWSAccessKeyId=identity", "application/x-www-form-urlencoded")).build(),
+            HttpResponse.builder().statusCode(409).build()
+      ).getKeyPairServices();
+
+      client.importKeyPairInRegion(null, "mykey", "ssh-rsa AA");
+   }
+}
\ No newline at end of file