diff --git a/.github/containers/ci_image/Dockerfile b/.github/containers/Dockerfile
similarity index 100%
rename from .github/containers/ci_image/Dockerfile
rename to .github/containers/Dockerfile
diff --git a/.github/containers/ci_image/Makefile b/.github/containers/Makefile
similarity index 100%
rename from .github/containers/ci_image/Makefile
rename to .github/containers/Makefile
diff --git a/.github/containers/firestore/docker-compose.yml b/.github/containers/firestore/docker-compose.yml
deleted file mode 100644
index d88ad1120f..0000000000
--- a/.github/containers/firestore/docker-compose.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-version: '3'
-
-services: 
-  app:
-    image: gcr.io/google.com/cloudsdktool/google-cloud-cli:437.0.1-emulators
-    command: ["gcloud", "emulators", "firestore", "start", "--host-port=0.0.0.0:8080"]
-    ports:
-      - 8080:8080
-      - 8081:8080
diff --git a/.github/containers/ci_image/install-python.sh b/.github/containers/install-python.sh
similarity index 100%
rename from .github/containers/ci_image/install-python.sh
rename to .github/containers/install-python.sh
diff --git a/.github/containers/ci_image/requirements.txt b/.github/containers/requirements.txt
similarity index 100%
rename from .github/containers/ci_image/requirements.txt
rename to .github/containers/requirements.txt
diff --git a/.github/workflows/build-ci-image.yml b/.github/workflows/build-ci-image.yml
index 92cacadcae..5bd0e6f692 100644
--- a/.github/workflows/build-ci-image.yml
+++ b/.github/workflows/build-ci-image.yml
@@ -62,7 +62,7 @@ jobs:
         uses: docker/build-push-action@v3
         with:
           push: ${{ github.event_name != 'pull_request' }}
-          context: .github/containers/ci_image
+          context: .github/containers
           platforms: linux/amd64
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
diff --git a/tests/datastore_firestore/conftest.py b/tests/datastore_firestore/conftest.py
index ad4aa04de4..f4d76c3e41 100644
--- a/tests/datastore_firestore/conftest.py
+++ b/tests/datastore_firestore/conftest.py
@@ -45,7 +45,7 @@
 def client():
     os.environ["FIRESTORE_EMULATOR_HOST"] = "%s:%d" % (FIRESTORE_HOST, FIRESTORE_PORT)
     client = Client()
-    list(client.collections(retry=None))  # Ensure connection is available
+    client.collection("healthcheck").document("healthcheck").set({}, retry=None, timeout=5)  # Ensure connection is available
     return client
 
 
diff --git a/tox.ini b/tox.ini
index b0678bb14b..dbe103fe44 100644
--- a/tox.ini
+++ b/tox.ini
@@ -83,7 +83,7 @@ envlist =
     memcached-datastore_memcache-{py27,py37,py38,py39,py310,py311,pypy27,pypy38}-memcached01,
     mysql-datastore_mysql-mysql080023-py27,
     mysql-datastore_mysql-mysqllatest-{py37,py38,py39,py310,py311},
-    firestore-datastore_firestore-{py37,py38,py39,py310,py311,pypy38},
+    firestore-datastore_firestore-{py37,py38,py39,py310,py311},
     postgres-datastore_postgresql-{py37,py38,py39},
     postgres-datastore_psycopg2-{py27,py37,py38,py39,py310,py311}-psycopg2latest
     postgres-datastore_psycopg2cffi-{py27,pypy27,py37,py38,py39,py310,py311}-psycopg2cffilatest,
@@ -419,7 +419,7 @@ commands =
 allowlist_externals={toxinidir}/.github/scripts/*
 
 install_command=
-    {toxinidir}/.github/scripts/retry.sh 3 pip install {opts} {packages}
+    pip install {opts} {packages}
 
 extras =
     agent_streaming: infinite-tracing