diff --git a/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestBasic.java b/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestBasic.java
index cdd7464..22065ac 100644
--- a/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestBasic.java
+++ b/beatrix/src/test/java/com/ning/billing/beatrix/integration/TestBasic.java
@@ -266,7 +266,7 @@ public class TestBasic {
Thread.sleep(600000);
}
- @Test(groups = "stress", enabled = false)
+ @Test(groups = "stress", enabled = true)
public void stressTest() throws Exception {
final int maxIterations = 7;
for (int curIteration = 0; curIteration < maxIterations; curIteration++) {
@@ -356,7 +356,7 @@ public class TestBasic {
busHandler.pushExpectedEvent(NextEvent.PAYMENT);
}
- clock.setDeltaFromReality(AT_LEAST_ONE_MONTH_MS);
+ clock.addDeltaFromReality(AT_LEAST_ONE_MONTH_MS);
assertTrue(busHandler.isCompleted(DELAY));
diff --git a/entitlement/src/main/resources/com/ning/billing/entitlement/ddl.sql b/entitlement/src/main/resources/com/ning/billing/entitlement/ddl.sql
index c3fd808..c39d001 100644
--- a/entitlement/src/main/resources/com/ning/billing/entitlement/ddl.sql
+++ b/entitlement/src/main/resources/com/ning/billing/entitlement/ddl.sql
@@ -17,6 +17,9 @@ CREATE TABLE entitlement_events (
is_active bool DEFAULT 1,
PRIMARY KEY(id)
) ENGINE=innodb;
+CREATE INDEX idx_ent_1 ON entitlement_events(subscription_id,is_active,effective_dt);
+CREATE INDEX idx_ent_2 ON entitlement_events(subscription_id,effective_dt,created_dt,requested_dt,id);
+
DROP TABLE IF EXISTS subscriptions;
CREATE TABLE subscriptions (
