diff --git a/.travis-Dockerfile b/.travis-Dockerfile
index 8a0af3e..ca94164 100644
--- a/.travis-Dockerfile
+++ b/.travis-Dockerfile
@@ -12,16 +12,14 @@ RUN yum -y update && \
         gcc-c++ \
         krb5-devel \
         libffi-devel \
-        libyaml-devel \
         openssl-devel \
-        python27 \
-        python-devel \
-        python-pip \
+        python3-devel \
+        python3-pip \
         redhat-rpm-config \
         swig \
         zeromq-devel \
         rpm-devel \
-        python2-koji \
+        python3-koji \
         libmodulemd && \
     yum clean all
 
diff --git a/Vagrantfile b/Vagrantfile
index 68eac95..f5fd59d 100644
--- a/Vagrantfile
+++ b/Vagrantfile
@@ -13,15 +13,14 @@ $script = <<SCRIPT
         zeromq-devel \
         koji \
         swig \
-        fedmsg \
-        libyaml-devel
+        fedmsg
     cd /opt/pdc-updater/src
     python setup.py develop
     pip install -r test-requirements.txt
 SCRIPT
 
 Vagrant.configure("2") do |config|
-  config.vm.box = "fedora/24-cloud-base"
+  config.vm.box = "fedora/31-cloud-base"
   config.vm.provider :virtualbox do |v|
     v.customize ["modifyvm", :id, "--memory", 2048]
   end
diff --git a/pdcupdater/services.py b/pdcupdater/services.py
index 541dd85..f4094d0 100644
--- a/pdcupdater/services.py
+++ b/pdcupdater/services.py
@@ -1,9 +1,12 @@
 import logging
 import operator
+import os
 
 import bs4
 import requests
 
+from fasjson_client import Client
+
 import pdcupdater.handlers.compose
 import pdcupdater.utils
 
@@ -72,13 +75,18 @@ def old_composes(base_url):
 
 
 @pdcupdater.utils.with_ridiculous_timeout
-def fas_persons(base_url, username, password):
+def fas_persons(base_url, username, password, fasjson):
     """ Return the list of users in the Fedora Account System. """
 
+    log.info("Connecting to Account System at %r" % base_url)
+    if fasjson:
+        client = Client(url=base_url)
+        people = client.list_users().result
+        return people
+
     import fedora.client
     import fedora.client.fas2
 
-    log.info("Connecting to FAS at %r" % base_url)
     fasclient = fedora.client.fas2.AccountSystem(
         base_url=base_url, username=username, password=password)
 
diff --git a/pdcupdater/tests/vcr-request-data.tar.gz b/pdcupdater/tests/vcr-request-data.tar.gz
deleted file mode 100644
index 054588a..0000000
Binary files a/pdcupdater/tests/vcr-request-data.tar.gz and /dev/null differ
diff --git a/setup.py b/setup.py
index 99524f0..ea3c736 100644
--- a/setup.py
+++ b/setup.py
@@ -12,6 +12,7 @@
     'pdc-client',
     'six',
     'modulemd',
+    'fasjson-client',
 ]