diff --git a/.circleci/config.yml b/.circleci/config.yml
index 2c47bfc5..3be131b3 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -49,17 +49,18 @@ jobs:
           name: Install dependencies
           command: |
             sudo apt-get update
-            sudo apt-get install -y xvfb tor obfs4proxy gcc python3-dev
+            sudo apt-get install -y tor obfs4proxy gcc python3-dev python3-pyside2.qtcore python3-pyside2.qtwidgets python3-pyside2.qtgui
+            sudo apt-get install -y xvfb x11-utils libxkbcommon-x11-0 libxcb-randr0-dev libxcb-xtest0-dev libxcb-xinerama0-dev libxcb-shape0-dev libxcb-xkb-dev libxcb-render-util0 libxcb-icccm4 libxcb-keysyms1 libxcb-image0
             cd ~/repo/cli
             poetry install
             poetry build
             cp dist/onionshare_cli-*.whl ~/repo/desktop
             cd ~/repo/desktop
-            pip install briefcase pytest pytest-briefcase pytest-faulthandler pytest-qt
+            pip install briefcase pytest pytest-briefcase pytest-faulthandler pytest-qt pytest-xvfb
             pip install $(python -c 'import toml; print(" ".join(toml.loads(open("pyproject.toml").read())["tool"]["briefcase"]["app"]["onionshare"]["requires"]))')
 
       - run:
           name: Run tests
           command: |
             cd ~/repo/desktop
-            xvfb-run ./tests/run.sh
+            ./tests/run.sh
diff --git a/cli/onionshare_cli/mode_settings.py b/cli/onionshare_cli/mode_settings.py
index b353fcde..4e3a27ab 100644
--- a/cli/onionshare_cli/mode_settings.py
+++ b/cli/onionshare_cli/mode_settings.py
@@ -102,7 +102,7 @@ class ModeSettings:
         elif self.common.platform == "Windows":
             # On Windows, os.path.expanduser() needs to use backslash, or else it
             # retains the forward slash, which breaks opening the folder in explorer.
-            return os.path.expanduser("~\OnionShare")
+            return os.path.expanduser("~\\OnionShare")
         else:
             # All other OSes
             return os.path.expanduser("~/OnionShare")
diff --git a/desktop/src/onionshare/settings_dialog.py b/desktop/src/onionshare/settings_dialog.py
index e1027323..5f37bda1 100644
--- a/desktop/src/onionshare/settings_dialog.py
+++ b/desktop/src/onionshare/settings_dialog.py
@@ -665,9 +665,14 @@ class SettingsDialog(QtWidgets.QDialog):
             else:
                 tor_status_update_func = None
 
-            onion = Onion(self.common, use_tmp_dir=True, get_tor_paths=self.common.gui.get_tor_paths)
+            onion = Onion(
+                self.common,
+                use_tmp_dir=True,
+                get_tor_paths=self.common.gui.get_tor_paths,
+            )
             onion.connect(
-                custom_settings=settings, tor_status_update_func=tor_status_update_func,
+                custom_settings=settings,
+                tor_status_update_func=tor_status_update_func,
             )
 
             # If an exception hasn't been raised yet, the Tor settings work