diff --git a/uc_cart/tests/uc_cart.test b/uc_cart/tests/uc_cart.test
index d96f837..021bfba 100644
--- a/uc_cart/tests/uc_cart.test
+++ b/uc_cart/tests/uc_cart.test
@@ -95,8 +95,6 @@ class UbercartCartCheckoutTestCase extends UbercartTestHelper {
     foreach ($items as $item) {
       uc_cart_remove_item($item->nid, NULL, $item->data);
     }
-    // @TODO: remove the need for this
-    uc_cart_get_contents(NULL, 'rebuild');
 
     $items = uc_cart_get_contents();
     $this->assertEqual(count($items), 0, 'Cart is empty after removal.');
diff --git a/uc_cart/uc_cart.module b/uc_cart/uc_cart.module
index e98c7e2..1ee0140 100644
--- a/uc_cart/uc_cart.module
+++ b/uc_cart/uc_cart.module
@@ -1231,6 +1231,9 @@ function uc_cart_remove_item($nid, $cid = NULL, $data = array()) {
 
   if (!empty($result['uc_cart_item'])) {
     entity_delete_multiple('uc_cart_item', array_keys($result['uc_cart_item']));
+
+    // Rebuild cart cache.
+    uc_cart_get_contents($cart_id, 'rebuild');
   }
 }