diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/VirtualMachineExpunged.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/VirtualMachineExpunged.java
index be81ab6f1b..3873b1e5a2 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/VirtualMachineExpunged.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/predicates/VirtualMachineExpunged.java
@@ -34,7 +34,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
  * 
  * Tests to see if a virtualMachine is expunged from the system
  * 
- * @author Adrian Cole
+ * @author Andrei Savu
  */
 @Singleton
 public class VirtualMachineExpunged implements Predicate<VirtualMachine> {
diff --git a/apis/cloudstack/src/test/java/org/jclouds/cloudstack/predicates/VirtualMachineExpungedTest.java b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/predicates/VirtualMachineExpungedTest.java
new file mode 100644
index 0000000000..380c022488
--- /dev/null
+++ b/apis/cloudstack/src/test/java/org/jclouds/cloudstack/predicates/VirtualMachineExpungedTest.java
@@ -0,0 +1,56 @@
+/**
+ * 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.cloudstack.predicates;
+
+import org.jclouds.cloudstack.CloudStackClient;
+import org.jclouds.cloudstack.domain.VirtualMachine;
+import org.jclouds.cloudstack.features.VirtualMachineClient;
+import org.testng.annotations.Test;
+
+import static org.easymock.EasyMock.createMock;
+import static org.easymock.EasyMock.expect;
+import static org.easymock.EasyMock.replay;
+import static org.easymock.EasyMock.verify;
+import static org.testng.Assert.assertTrue;
+
+/**
+ * @author Andrei Savu
+ */
+@Test(groups = "unit", testName = "VirtualMachineExpungedTest")
+public class VirtualMachineExpungedTest {
+
+   @Test
+   public void testWaitForVirtualMachineToBeExpunged() {
+      CloudStackClient client = createMock(CloudStackClient.class);
+      VirtualMachineClient virtualMachineClient = createMock(VirtualMachineClient.class);
+
+      long virtualMachineId = 229;
+      VirtualMachine virtualMachine = VirtualMachine.builder().id(virtualMachineId).build();
+
+      expect(client.getVirtualMachineClient()).andReturn(virtualMachineClient);
+      expect(virtualMachineClient.getVirtualMachine(virtualMachineId)).andReturn(null);
+
+      replay(client, virtualMachineClient);
+
+      assertTrue(new VirtualMachineExpunged(client).apply(virtualMachine));
+
+      verify(client, virtualMachineClient);
+   }
+}