diff --git a/Gemfile b/Gemfile
index a9c340af7..72819d68a 100644
--- a/Gemfile
+++ b/Gemfile
@@ -22,7 +22,8 @@ gem 'streamio-ffmpeg'
 gem 'rubyzip', :require => "zip"
 gem 'stripe'
 gem 'twitter'
-gem 'aws-sdk', '~> 2'
+gem 'aws-sdk-s3', '~> 1'
+gem 'aws-sdk-sqs', '~> 1'
 gem 'responders'
 gem 'dtext_rb', git: "https://github.com/evazion/dtext_rb.git", require: "dtext"
 gem 'memoist'
@@ -81,7 +82,7 @@ group :test do
   gem "shoulda-context"
   gem "shoulda-matchers"
   gem "factory_bot"
-  gem "mocha", :require => "mocha/setup"
+  gem "mocha"
   gem "ffaker"
   gem "simplecov", :require => false
   gem "webmock"
diff --git a/Gemfile.lock b/Gemfile.lock
index e2cf274de..78f7548e0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -80,13 +80,22 @@ GEM
       sshkit (>= 1.6.1, != 1.7.0)
     awesome_print (1.8.0)
     aws-eventstream (1.0.3)
-    aws-sdk (2.11.319)
-      aws-sdk-resources (= 2.11.319)
-    aws-sdk-core (2.11.319)
-      aws-sigv4 (~> 1.0)
+    aws-partitions (1.251.0)
+    aws-sdk-core (3.84.0)
+      aws-eventstream (~> 1.0, >= 1.0.2)
+      aws-partitions (~> 1, >= 1.239.0)
+      aws-sigv4 (~> 1.1)
       jmespath (~> 1.0)
-    aws-sdk-resources (2.11.319)
-      aws-sdk-core (= 2.11.319)
+    aws-sdk-kms (1.26.0)
+      aws-sdk-core (~> 3, >= 3.71.0)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-s3 (1.59.0)
+      aws-sdk-core (~> 3, >= 3.83.0)
+      aws-sdk-kms (~> 1)
+      aws-sigv4 (~> 1.1)
+    aws-sdk-sqs (1.23.1)
+      aws-sdk-core (~> 3, >= 3.71.0)
+      aws-sigv4 (~> 1.1)
     aws-sigv4 (1.1.0)
       aws-eventstream (~> 1.0, >= 1.0.2)
     bcrypt (3.1.13)
@@ -146,7 +155,7 @@ GEM
     erubi (1.9.0)
     factory_bot (5.1.1)
       activesupport (>= 4.2.0)
-    faraday (0.17.0)
+    faraday (0.17.1)
       multipart-post (>= 1.2, < 3)
     ffaker (2.13.0)
     ffi (1.11.3)
@@ -180,7 +189,7 @@ GEM
     json (2.2.0)
     jwt (2.2.1)
     kgio (2.11.2)
-    listen (3.2.0)
+    listen (3.2.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     loofah (2.4.0)
@@ -199,14 +208,13 @@ GEM
       nokogiri (~> 1.6)
       ntlm-http (~> 0.1, >= 0.1.1)
       webrobots (>= 0.0.9, < 0.2)
-    memoist (0.16.1)
+    memoist (0.16.2)
     memoizable (0.4.2)
       thread_safe (~> 0.3, >= 0.3.1)
     memory_profiler (0.9.14)
     meta_request (0.7.2)
       rack-contrib (>= 1.1, < 3)
       railties (>= 3.0.0, < 7)
-    metaclass (0.0.4)
     method_source (0.9.2)
     mime-types (3.3)
       mime-types-data (~> 3.2015)
@@ -217,8 +225,7 @@ GEM
     minitest (5.13.0)
     minitest-ci (3.4.0)
       minitest (>= 5.0.6)
-    mocha (1.9.0)
-      metaclass (~> 0.0.1)
+    mocha (1.10.1)
     mock_redis (0.22.0)
     msgpack (1.3.1)
     msgpack (1.3.1-x64-mingw32)
@@ -237,9 +244,9 @@ GEM
     net-ssh (5.2.0)
     newrelic_rpm (6.7.0.359)
     nio4r (2.5.2)
-    nokogiri (1.10.5)
+    nokogiri (1.10.7)
       mini_portile2 (~> 2.4.0)
-    nokogiri (1.10.5-x64-mingw32)
+    nokogiri (1.10.7-x64-mingw32)
       mini_portile2 (~> 2.4.0)
     nokogumbo (2.0.2)
       nokogiri (~> 1.8, >= 1.8.4)
@@ -264,7 +271,7 @@ GEM
     pry-rails (0.3.9)
       pry (>= 0.10.4)
     public_suffix (4.0.1)
-    puma (4.3.0)
+    puma (4.3.1)
       nio4r (~> 2.0)
     rack (2.0.7)
     rack-contrib (2.1.0)
@@ -364,9 +371,7 @@ GEM
     statistics2 (0.54)
     streamio-ffmpeg (3.0.2)
       multi_json (~> 1.8)
-    stripe (4.22.0)
-      faraday (~> 0.13)
-      net-http-persistent (~> 3.0)
+    stripe (5.11.0)
     thor (0.20.3)
     thread_safe (0.3.6)
     tilt (2.0.10)
@@ -409,7 +414,7 @@ GEM
       chronic (>= 0.6.3)
     xpath (3.2.0)
       nokogiri (~> 1.8)
-    zeitwerk (2.2.1)
+    zeitwerk (2.2.2)
 
 PLATFORMS
   ruby
@@ -419,7 +424,8 @@ DEPENDENCIES
   activemodel-serializers-xml
   addressable
   awesome_print
-  aws-sdk (~> 2)
+  aws-sdk-s3 (~> 1)
+  aws-sdk-sqs (~> 1)
   bcrypt
   bootsnap
   builder
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 3205a89e5..b327177e2 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -12,6 +12,7 @@ require File.expand_path('../../config/environment', __FILE__)
 require 'rails/test_help'
 require 'cache'
 require 'webmock/minitest'
+require 'mocha/minitest'
 
 Dir[File.expand_path(File.dirname(__FILE__) + "/factories/*.rb")].each {|file| require file}
 Dir[File.expand_path(File.dirname(__FILE__) + "/test_helpers/*.rb")].each {|file| require file}