killbill-uncached

diff --git a/payment/src/test/java/com/ning/billing/payment/api/TestPaymentApi.java b/payment/src/test/java/com/ning/billing/payment/api/TestPaymentApi.java
index 2a2d093..f3a57e3 100644
--- a/payment/src/test/java/com/ning/billing/payment/api/TestPaymentApi.java
+++ b/payment/src/test/java/com/ning/billing/payment/api/TestPaymentApi.java
@@ -90,11 +90,13 @@ public class TestPaymentApi extends PaymentTestSuite {
 
     @BeforeClass(groups = "fast")
     public void setupClass() throws Exception {
-        account = testHelper.createTestAccount("yoyo.yahoo.com");
+        account = testHelper.createTestAccount("yoyo.yahoo.com", false);
     }
 
     @BeforeMethod(groups = "fast")
-    public void setUp() throws EventBusException {
+    public void setUp() throws Exception {
+        final PaymentMethodPlugin paymentMethodInfo = new DefaultNoOpPaymentMethodPlugin(UUID.randomUUID().toString(), true, null);
+        testHelper.addTestPaymentMethod(account, paymentMethodInfo);
         eventBus.start();
     }
 

diff --git a/payment/src/test/java/com/ning/billing/payment/TestHelper.java b/payment/src/test/java/com/ning/billing/payment/TestHelper.java
index af509ab..ed4c905 100644
--- a/payment/src/test/java/com/ning/billing/payment/TestHelper.java
+++ b/payment/src/test/java/com/ning/billing/payment/TestHelper.java
@@ -95,7 +95,7 @@ public class TestHelper {
         return invoice;
     }
 
-    public Account createTestAccount(final String email) throws Exception {
+    public Account createTestAccount(final String email, final boolean addPaymentMethod) throws Exception {
         final String name = "First" + UUID.randomUUID().toString() + " " + "Last" + UUID.randomUUID().toString();
         final String externalKey = UUID.randomUUID().toString();
 
@@ -114,12 +114,14 @@ public class TestHelper {
         Mockito.when(accountUserApi.getAccountById(Mockito.<UUID>any())).thenReturn(account);
         Mockito.when(accountUserApi.getAccountByKey(Mockito.anyString())).thenReturn(account);
 
-        final PaymentMethodPlugin pm = new DefaultNoOpPaymentMethodPlugin(UUID.randomUUID().toString(), true, null);
-        addTestPaymentMethod(account, pm);
+        if (addPaymentMethod) {
+            final PaymentMethodPlugin pm = new DefaultNoOpPaymentMethodPlugin(UUID.randomUUID().toString(), true, null);
+            addTestPaymentMethod(account, pm);
+        }
         return account;
     }
 
-    private void addTestPaymentMethod(final Account account, final PaymentMethodPlugin paymentMethodInfo) throws Exception {
+    public void addTestPaymentMethod(final Account account, final PaymentMethodPlugin paymentMethodInfo) throws Exception {
         final UUID paymentMethodId = paymentApi.addPaymentMethod(PaymentTestModuleWithMocks.PLUGIN_TEST_NAME, account, true, paymentMethodInfo, context);
         Mockito.when(account.getPaymentMethodId()).thenReturn(paymentMethodId);
     }

diff --git a/payment/src/test/java/com/ning/billing/payment/TestRetryService.java b/payment/src/test/java/com/ning/billing/payment/TestRetryService.java
index 0c021a6..9deb279 100644
--- a/payment/src/test/java/com/ning/billing/payment/TestRetryService.java
+++ b/payment/src/test/java/com/ning/billing/payment/TestRetryService.java
@@ -151,7 +151,7 @@ public class TestRetryService extends PaymentTestSuite {
 
     private void testSchedulesRetryInternal(final int maxTries, final FailureType failureType) throws Exception {
 
-        final Account account = testHelper.createTestAccount("yiyi.gmail.com");
+        final Account account = testHelper.createTestAccount("yiyi.gmail.com", true);
         final Invoice invoice = testHelper.createTestInvoice(account, clock.getUTCToday(), Currency.USD);
         final BigDecimal amount = new BigDecimal("10.00");
         final UUID subscriptionId = UUID.randomUUID();