diff --git a/.ci/functions/imports.sh b/.ci/functions/imports.sh
index daed6406..e66de8e3 100755
--- a/.ci/functions/imports.sh
+++ b/.ci/functions/imports.sh
@@ -18,7 +18,7 @@ require_stack_version
 if [[ -z $es_node_name ]]; then
   # only set these once
   set -euo pipefail
-  export TEST_SUITE=${TEST_SUITE-free}
+  export TEST_SUITE=${TEST_SUITE-oss}
   export RUNSCRIPTS=${RUNSCRIPTS-}
   export DETACH=${DETACH-false}
   export CLEANUP=${CLEANUP-false}
@@ -26,10 +26,7 @@ if [[ -z $es_node_name ]]; then
   export es_node_name=instance
   export elastic_password=changeme
   export elasticsearch_image=opendistro-for-elasticsearch
-  export elasticsearch_url=https://elastic:${elastic_password}@${es_node_name}:9200
-  if [[ $TEST_SUITE != "platinum" ]]; then
-    export elasticsearch_url=http://${es_node_name}:9200
-  fi
+  export elasticsearch_url=http://elastic:${elastic_password}@${es_node_name}:9200
   export external_elasticsearch_url=${elasticsearch_url/$es_node_name/localhost}
   export elasticsearch_container="${elasticsearch_image}:${STACK_VERSION}"
 
diff --git a/.ci/run-elasticsearch.sh b/.ci/run-elasticsearch.sh
index 4d7cb3c7..e8409e5d 100755
--- a/.ci/run-elasticsearch.sh
+++ b/.ci/run-elasticsearch.sh
@@ -4,7 +4,7 @@
 # to form a cluster suitable for running the REST API tests.
 #
 # Export the STACK_VERSION variable, eg. '8.0.0-SNAPSHOT'.
-# Export the TEST_SUITE variable, eg. 'free' or 'platinum' defaults to 'free'.
+# Export the TEST_SUITE variable, i.e. 'oss'
 # Export the NUMBER_OF_NODES variable to start more than 1 node
 
 # Version 1.4.0
@@ -42,23 +42,6 @@ environment=($(cat <<-END
   --env action.destructive_requires_name=false
 END
 ))
-if [[ "$TEST_SUITE" == "platinum" ]]; then
-  environment+=($(cat <<-END
-    --env ELASTIC_PASSWORD=$elastic_password
-END
-))
-  volumes+=($(cat <<-END
-    --volume $ssl_cert:/usr/share/elasticsearch/config/certs/testnode.crt
-    --volume $ssl_key:/usr/share/elasticsearch/config/certs/testnode.key
-    --volume $ssl_ca:/usr/share/elasticsearch/config/certs/ca.crt
-END
-))
-fi
-
-cert_validation_flags=""
-if [[ "$TEST_SUITE" == "platinum" ]]; then
-  cert_validation_flags="--insecure --cacert /usr/share/elasticsearch/config/certs/ca.crt --resolve ${es_node_name}:443:127.0.0.1"
-fi
 
 # Pull the container, retry on failures up to 5 times with
 # short delays between each attempt. Fixes most transient network errors.
@@ -111,7 +94,7 @@ END
     --ulimit nofile=65536:65536 \
     --ulimit memlock=-1:-1 \
     --detach="$local_detach" \
-    --health-cmd="curl $cert_validation_flags --fail $elasticsearch_url/_cluster/health || exit 1" \
+    --health-cmd="curl -vvv -s --fail $elasticsearch_url/_cluster/health || exit 1" \
     --health-interval=2s \
     --health-retries=20 \
     --health-timeout=2s \
diff --git a/.ci/run-repository.sh b/.ci/run-repository.sh
index cd598e6a..cc71aac9 100755
--- a/.ci/run-repository.sh
+++ b/.ci/run-repository.sh
@@ -10,7 +10,7 @@
 # NODE_NAME -- The docker container name also used as Elasticsearch node name
 
 # When run in CI the test-matrix is used to define additional variables
-# TEST_SUITE -- either `oss` or `xpack`, defaults to `oss` in `run-tests`
+# TEST_SUITE -- defaults to `oss` in `run-tests`
 
 set -e
 
diff --git a/.ci/run-tests b/.ci/run-tests
index c5739ac6..713e4146 100755
--- a/.ci/run-tests
+++ b/.ci/run-tests
@@ -6,7 +6,7 @@
 
 # Default environment variables
 export STACK_VERSION="${STACK_VERSION:=1.13.2}"
-export TEST_SUITE="${TEST_SUITE:=free}"
+export TEST_SUITE="${TEST_SUITE:=oss}"
 export PYTHON_VERSION="${PYTHON_VERSION:=3.9}"
 export PYTHON_CONNECTION_CLASS="${PYTHON_CONNECTION_CLASS:=Urllib3HttpConnection}"
 
diff --git a/.ci/test-matrix.yml b/.ci/test-matrix.yml
index 891cd9b0..03236f6e 100755
--- a/.ci/test-matrix.yml
+++ b/.ci/test-matrix.yml
@@ -2,7 +2,7 @@ STACK_VERSION:
   - 7.10.2
 
 TEST_SUITE:
-  - free
+  - oss
 
 PYTHON_VERSION:
   - "2.7"
diff --git a/test_elasticsearch/test_server/test_rest_api_spec.py b/test_elasticsearch/test_server/test_rest_api_spec.py
index aad920ef..19dcd39c 100644
--- a/test_elasticsearch/test_server/test_rest_api_spec.py
+++ b/test_elasticsearch/test_server/test_rest_api_spec.py
@@ -536,7 +536,7 @@ try:
             # is to remove most of the file path prefixes and
             # the .yml suffix.
             pytest_test_name = yaml_file.rpartition(".")[0].replace(".", "/")
-            for prefix in ("rest-api-spec/", "test/", "free/", "platinum/"):
+            for prefix in ("rest-api-spec/", "test/", "oss/"):
                 if pytest_test_name.startswith(prefix):
                     pytest_test_name = pytest_test_name[len(prefix) :]
             pytest_param_id = "%s[%d]" % (pytest_test_name, test_number)