diff --git a/app/assets/javascripts/darkswarm/services/stripe_elements.js.coffee b/app/assets/javascripts/darkswarm/services/stripe_elements.js.coffee
index 8c3837845f..256f6b1681 100644
--- a/app/assets/javascripts/darkswarm/services/stripe_elements.js.coffee
+++ b/app/assets/javascripts/darkswarm/services/stripe_elements.js.coffee
@@ -15,9 +15,8 @@ Darkswarm.factory 'StripeElements', ($rootScope, Loading, RailsFlashLoader) ->
 
       @stripe.createToken(@card, cardData).then (response) =>
         if(response.error)
-          $rootScope.$apply ->
-            Loading.clear()
-            RailsFlashLoader.loadFlash({error: t("error") + ": #{response.error.message}"})
+          Loading.clear()
+          RailsFlashLoader.loadFlash({error: t("error") + ": #{response.error.message}"})
         else
           secrets.token = response.token.id
           secrets.cc_type = @mapCC(response.token.card.brand)
diff --git a/spec/javascripts/unit/darkswarm/services/checkout_spec.js.coffee b/spec/javascripts/unit/darkswarm/services/checkout_spec.js.coffee
index 1a107776f0..9120ad31b6 100644
--- a/spec/javascripts/unit/darkswarm/services/checkout_spec.js.coffee
+++ b/spec/javascripts/unit/darkswarm/services/checkout_spec.js.coffee
@@ -117,19 +117,19 @@ describe 'Checkout service', ->
         expect(Checkout.errors).toEqual {error: "frogs"}
 
     describe "when using the Stripe Connect gateway", ->
-      beforeEach inject ($injector, StripeJS) ->
+      beforeEach inject ($injector, StripeElements) ->
         Checkout.order.payment_method_id = 666
 
-      it "requests a Stripe token before submitting", inject (StripeJS) ->
-        spyOn(StripeJS, "requestToken")
+      it "requests a Stripe token before submitting", inject (StripeElements) ->
+        spyOn(StripeElements, "requestToken")
         Checkout.purchase()
-        expect(StripeJS.requestToken).toHaveBeenCalled()
+        expect(StripeElements.requestToken).toHaveBeenCalled()
 
-      it "doesn't hit Stripe when reusing a credit card", inject (StripeJS) ->
-        spyOn(StripeJS, "requestToken")
+      it "doesn't hit Stripe when reusing a credit card", inject (StripeElements) ->
+        spyOn(StripeElements, "requestToken")
         Checkout.secrets.selected_card = 1
         Checkout.purchase()
-        expect(StripeJS.requestToken).not.toHaveBeenCalled()
+        expect(StripeElements.requestToken).not.toHaveBeenCalled()
 
   describe "data preprocessing", ->
     beforeEach ->
diff --git a/spec/javascripts/unit/darkswarm/services/stripe_spec.js.coffee b/spec/javascripts/unit/darkswarm/services/stripe_elements_spec.js.coffee
similarity index 53%
rename from spec/javascripts/unit/darkswarm/services/stripe_spec.js.coffee
rename to spec/javascripts/unit/darkswarm/services/stripe_elements_spec.js.coffee
index 1cf883b316..1cf860ed3c 100644
--- a/spec/javascripts/unit/darkswarm/services/stripe_spec.js.coffee
+++ b/spec/javascripts/unit/darkswarm/services/stripe_elements_spec.js.coffee
@@ -1,6 +1,7 @@
-describe 'StripeJS Service', ->
-  $httpBackend = StripeJS = null
-  StripeMock = { card: {} }
+describe 'StripeElements Service', ->
+  $httpBackend = $q = $rootScope = StripeElements = null
+  StripeMock = { createToken: null }
+  CardMock = { some: "card" }
 
   beforeEach ->
     module 'Darkswarm'
@@ -8,9 +9,11 @@ describe 'StripeJS Service', ->
       $provide.value "railsFlash", null
       null
 
-    inject (_StripeJS_, _$httpBackend_) ->
+    inject (_StripeElements_, _$httpBackend_, _$q_, _$rootScope_) ->
       $httpBackend = _$httpBackend_
-      StripeJS = _StripeJS_
+      StripeElements = _StripeElements_
+      $q = _$q_
+      $rootScope = _$rootScope_
 
   describe "requestToken", ->
     secrets = {}
@@ -18,16 +21,18 @@ describe 'StripeJS Service', ->
     response = null
 
     beforeEach inject ($window) ->
-      $window.Stripe = StripeMock
+      StripeElements.stripe = StripeMock
+      StripeElements.card = CardMock
 
     describe "with satifactory data", ->
       beforeEach ->
         submit = jasmine.createSpy()
-        response = { id: "token", card: { brand: 'MasterCard', last4: "5678", exp_month: 10, exp_year: 2099 } }
-        StripeMock.card.createToken = (params, callback) => callback(200, response)
+        response = { token: { id: "token", card: { brand: 'MasterCard', last4: "5678", exp_month: 10, exp_year: 2099 } } }
+        StripeMock.createToken = => $q.when(response)
 
       it "saves the response data to secrets, and submits the form", ->
-        StripeJS.requestToken(secrets, submit)
+        StripeElements.requestToken(secrets, submit)
+        $rootScope.$digest() # required for #then to by called
         expect(secrets.token).toEqual "token"
         expect(secrets.cc_type).toEqual "mastercard"
         expect(submit).toHaveBeenCalled()
@@ -35,13 +40,14 @@ describe 'StripeJS Service', ->
     describe "with unsatifactory data", ->
       beforeEach ->
         submit = jasmine.createSpy()
-        response = { id: "token", error: { message: 'There was a problem' } }
-        StripeMock.card.createToken = (params, callback) => callback(400, response)
+        response = { token: {id: "token" }, error: { message: 'There was a problem' } }
+        StripeMock.createToken = => $q.when(response)
 
       it "doesn't submit the form, shows an error message instead", inject (Loading, RailsFlashLoader) ->
         spyOn(Loading, "clear")
         spyOn(RailsFlashLoader, "loadFlash")
-        StripeJS.requestToken(secrets, submit)
+        StripeElements.requestToken(secrets, submit)
+        $rootScope.$digest() # required for #then to by called
         expect(submit).not.toHaveBeenCalled()
         expect(Loading.clear).toHaveBeenCalled()
         expect(RailsFlashLoader.loadFlash).toHaveBeenCalledWith({error: "Error: There was a problem"})