@mamhoff could you check the tests on your PR https://github.com/solidusio/solidus_subscriptions/pull/309 We are on the closing line to fully fix the subscription gem and I would love to have it in there.