diff --git a/.circleci/config.yml b/.circleci/config.yml
index 3b9c9f21b..b8d68f09b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -33,7 +33,7 @@ workflows:
           context: main-builds
           filters:
             branches:
-              only: cristi/ci-improvements
+              only: cristi/ci-test-deployment
 
 jobs:
   test_server:
@@ -69,7 +69,7 @@ jobs:
 
   docker_build_and_deploy:
     docker:
-      - image: circleci/golang:1.15
+      - image: circleci/python:3.6-buster
     steps:
       - checkout
       - setup_remote_docker:
@@ -88,3 +88,12 @@ jobs:
       - run:
           name: Deploy Frontend and Server
           command: ./.circleci/deploy.sh
+      - run:
+          name: Test deployment
+          command: |
+            ./test-deployment/install_prerequisites.sh
+            SPECKLE_SERVER=https://latest.speckle.dev
+            if [[ "$CIRCLE_TAG" =~ ^v.* ]]; then
+              SPECKLE_SERVER=https://speckle.xyz
+            fi
+            ./test-deployment/run_tests.py $SPECKLE_SERVER
diff --git a/test-deployment/install_prerequisites.sh b/test-deployment/install_prerequisites.sh
new file mode 100755
index 000000000..56607d5a0
--- /dev/null
+++ b/test-deployment/install_prerequisites.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+set -e
+
+pip install specklepy
diff --git a/test-deployment/run_tests.py b/test-deployment/run_tests.py
new file mode 100755
index 000000000..86dc074e8
--- /dev/null
+++ b/test-deployment/run_tests.py
@@ -0,0 +1,47 @@
+#!/usr/bin/env python3
+
+# Script-style deployment testing: any error should fail the test and have non-zero exit code.
+
+import os
+import sys
+import requests
+import urllib.parse
+from specklepy.api.client import SpeckleClient
+from specklepy.api.models import ServerInfo
+
+
+# Setting the SPECKLE_SERVER to test on
+SPECKLE_SERVER = ''
+if len(sys.argv) > 1:
+    SPECKLE_SERVER = sys.argv[1]
+if not SPECKLE_SERVER:
+    SPECKLE_SERVER = os.getenv('SPECKLE_SERVER', '')
+if not SPECKLE_SERVER:
+    print("Error: No Speckle server specified. Use SPECKLE_SERVER environment variable or pass it as the first command-line argument")
+    exit(1)
+
+if not SPECKLE_SERVER.startswith('http://') and not SPECKLE_SERVER.startswith('https://'):
+    SPECKLE_SERVER = 'http://' + SPECKLE_SERVER
+
+print(f"Using Speckle server '{SPECKLE_SERVER}'")
+
+# Test if frontend is accessible
+frontend_response = requests.get(urllib.parse.urljoin(SPECKLE_SERVER, 'img/logo.ddce2456.svg'))
+assert frontend_response.status_code == 200, "Frontend request doesn't return status code 200"
+assert frontend_response.headers.get('Content-Type', '').startswith('image/'), 'Frontend logo Content-Type is not an image'
+print("Frontend accessible")
+
+# Test if backend is accessible
+graphql_accept_header = 'text/html,application/xhtml+xml,application/xml;q=0.9,image/avif,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9'
+backend_response = requests.get(urllib.parse.urljoin(SPECKLE_SERVER, 'graphql'), headers={'Accept': graphql_accept_header})
+assert backend_response.status_code == 200, "Backend request doesn't return status code 200"
+assert 'GraphQL Playground' in backend_response.text, "/graphql didn't respond with GraphQL Playground"
+print("Backend accessible")
+
+# Test basic unauthenticated operation using specklepy
+client = SpeckleClient(SPECKLE_SERVER, use_ssl=SPECKLE_SERVER.startswith('https://'))
+server_info = client.server.get()
+assert isinstance(server_info, ServerInfo), "GraphQL ServerInfo query error"
+print(f"GraphQL operation succeeded. Server name: {server_info.name}")
+
+print('Deployment tests PASS')