diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 5a84ca02..ff65cbd0 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -67,6 +67,18 @@ jobs:
   e2e-tests:
     name: Run end-to-end tests
     runs-on: ubuntu-latest
+    services:
+      db:
+        image: mariadb
+        env:
+          DATABASE_HOST: 127.0.0.1
+          MYSQL_ROOT_PASSWORD: zaphod
+          MYSQL_DATABASE: test
+          MYSQL_USER: test
+          MYSQL_PASSWORD: zaphod
+        ports:
+          - 4000:4000
+        options: --health-cmd="healthcheck.sh --connect --innodb_initialized" --health-interval=10s --health-timeout=5s --health-retries=3
 
     steps: 
       - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
@@ -90,4 +102,8 @@ jobs:
           check-latest: true
       - name: run Rekor end-to-end test
         run: ./pkg/test/rekor_e2e/rekor_monitor_e2e_test.sh
+      - name: Create mariadb
+        run: systemctl start mariadb
+      - name: run CT end-to-end test
+        run: ./pkg/test/ct_e2e/ct_monitor_e2e_test.sh
 
diff --git a/pkg/test/ct_e2e/ct_e2e_test.sh b/pkg/test/ct_e2e/ct_e2e_test.sh
deleted file mode 100755
index a70a1032..00000000
--- a/pkg/test/ct_e2e/ct_e2e_test.sh
+++ /dev/null
@@ -1,80 +0,0 @@
-#!/usr/bin/env bash
-#
-# Copyright 2024 The Sigstore Authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-set -ex
-
-pushd $HOME
-
-echo "downloading service repos"
-for repo in certificate-transparency-go trillian; do
-    if [[ ! -d $repo ]]; then
-        git clone https://github.com/sigstore/${repo}.git
-    fi
-done
-
-docker_compose="docker compose"
-
-pushd ./certificate-transparency-go/trillian/examples/deployment/docker/ctfe/
-docker compose up -d
-until [ $(${docker_compose} ps | grep -c "(healthy)") == 1 ];
-    do
-        if [ $count -eq 6 ]; then
-           echo "! timeout reached"
-           exit 1
-        else
-           echo -n "."
-           sleep 5
-           let 'count+=1'
-        fi
-    done
-popd
-
-docker exec -i ctfe-db mariadb -pzaphod -Dtest < ./trillian/storage/mysql/schema/storage.sql
-docker exec -i ctfe-db mariadb -pzaphod -Dtest < ./certificate-transparency-go/trillian/ctfe/storage/mysql/schema.sql
-
-CTFE_CONF_DIR=/tmp/ctfedocker
-if [ -d $CTFE_CONF_DIR ]; then
-  mkdir ${CTFE_CONF_DIR}
-fi
-
-TREE_ID=$(go run github.com/google/trillian/cmd/createtree@master --admin_server=localhost:8090)
-sed "s/@TREE_ID@/${TREE_ID}/" ./certificate-transparency-go/trillian/examples/deployment/docker/ctfe/ct_server.cfg > ${CTFE_CONF_DIR}/ct_server.cfg
-cp ./certificate-transparency-go/trillian/testdata/fake-ca.cert ${CTFE_CONF_DIR}
-docker volume create --driver local --opt type=none --opt device=${CTFE_CONF_DIR} --opt o=bind ctfe_config
-
-pushd ./certificate-transparency-go/trillian/examples/deployment/docker/ctfe/
-docker compose down
-docker compose --profile frontend up -d
-until [ $(${docker_compose} ps | grep -c "(healthy)") == 1 ];
-    do
-        if [ $count -eq 6 ]; then
-           echo "! timeout reached"
-            exit 1
-        else
-           echo -n "."
-           sleep 5
-           let 'count+=1'
-        fi
-    done
-popd
-
-popd
-go test -tags=ct_e2e -v -race ./pkg/test/ct_e2e/...
-
-pushd $HOME
-pushd ./certificate-transparency-go/trillian/examples/deployment/docker/ctfe/
-docker compose down
-popd
\ No newline at end of file
diff --git a/pkg/test/ct_e2e/ct_e2e_test.go b/pkg/test/ct_e2e/ct_monitor_e2e_test.go
similarity index 86%
rename from pkg/test/ct_e2e/ct_e2e_test.go
rename to pkg/test/ct_e2e/ct_monitor_e2e_test.go
index 2a8ae55d..d5d60a72 100644
--- a/pkg/test/ct_e2e/ct_e2e_test.go
+++ b/pkg/test/ct_e2e/ct_monitor_e2e_test.go
@@ -26,6 +26,7 @@ import (
 	ctclient "github.com/google/certificate-transparency-go/client"
 	"github.com/google/certificate-transparency-go/jsonclient"
 	"github.com/sigstore/rekor-monitor/pkg/ct"
+	"github.com/sigstore/rekor-monitor/pkg/identity"
 )
 
 const (
@@ -37,7 +38,7 @@ const (
 )
 
 func TestCTConsistencyCheck(t *testing.T) {
-	fulcioClient, err := ctclient.New("http://localhost:8080/testlog", http.DefaultClient, jsonclient.Options{})
+	fulcioClient, err := ctclient.New("http://127.0.0.1:8080/testlog", http.DefaultClient, jsonclient.Options{})
 	if err != nil {
 		t.Errorf("error instantiating ct client: %v", err)
 	}
@@ -50,8 +51,20 @@ func TestCTConsistencyCheck(t *testing.T) {
 	tempLogInfoFileName := tempLogInfoFile.Name()
 	defer os.Remove(tempLogInfoFileName)
 
-	err = ct.RunConsistencyCheck(fulcioClient, tempLogInfoFileName)
+	_, _, err = ct.RunConsistencyCheck(fulcioClient, tempLogInfoFileName)
 	if err != nil {
 		t.Errorf("failed to successfully complete consistency check: %v", err)
 	}
+
+	_, err = ct.IdentitySearch(fulcioClient, 0, 1, identity.MonitoredValues{
+		CertificateIdentities: []identity.CertificateIdentity{
+			{
+				CertSubject: "test-cert-subject",
+				Issuers:     []string{},
+			},
+		},
+	})
+	if err != nil {
+		t.Errorf("failed to successfully complete identity search: %v", err)
+	}
 }
diff --git a/pkg/test/ct_e2e/ct_monitor_e2e_test.sh b/pkg/test/ct_e2e/ct_monitor_e2e_test.sh
new file mode 100755
index 00000000..9b0ea166
--- /dev/null
+++ b/pkg/test/ct_e2e/ct_monitor_e2e_test.sh
@@ -0,0 +1,125 @@
+#!/usr/bin/env bash
+#
+# Copyright 2024 The Sigstore Authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+set -ex
+
+pushd $HOME
+
+echo "downloading service repos"
+for repo in certificate-transparency-go trillian; do
+    if [[ ! -d $repo ]]; then
+        git clone https://github.com/google/${repo}.git
+    fi
+done
+
+docker_compose="docker compose"
+
+pushd ./certificate-transparency-go/trillian/examples/deployment/docker/ctfe/
+docker compose up -d
+sleep 30
+popd
+
+die() {
+  echo "$*" > /dev/stderr
+  exit 1
+}
+
+collect_vars() {
+  # set unset environment variables to defaults
+  [ -z ${MYSQL_ROOT_USER+x} ] && MYSQL_ROOT_USER="root"
+  [ -z ${MYSQL_HOST+x} ] && MYSQL_HOST="localhost"
+  [ -z ${MYSQL_PORT+x} ] && MYSQL_PORT="3306"
+  [ -z ${MYSQL_DATABASE+x} ] && MYSQL_DATABASE="test"
+  [ -z ${MYSQL_USER+x} ] && MYSQL_USER="test"
+  [ -z ${MYSQL_PASSWORD+x} ] && MYSQL_PASSWORD="zaphod"
+  [ -z ${MYSQL_ROOT_PASSWORD+x} ] && MYSQL_ROOT_PASSWORD="zaphod"
+  [ -z ${MYSQL_USER_HOST+x} ] && MYSQL_USER_HOST="localhost"
+  FLAGS=()
+
+  # handle flags
+  FORCE=false
+  VERBOSE=false
+  while [[ $# -gt 0 ]]; do
+    case "$1" in
+      --force) FORCE=true ;;
+      --verbose) VERBOSE=true ;;
+      --help) usage; exit ;;
+      *) FLAGS+=("$1")
+    esac
+    shift 1
+  done
+
+  FLAGS+=(-u "${MYSQL_ROOT_USER}")
+  FLAGS+=(--host "${MYSQL_HOST}")
+  FLAGS+=(--port "${MYSQL_PORT}")
+
+  # Optionally print flags (before appending password)
+  [[ ${VERBOSE} = 'true' ]] && echo "- Using MySQL Flags: ${FLAGS[@]}"
+
+  # append password if supplied
+  [ -z ${MYSQL_ROOT_PASSWORD+x} ] || FLAGS+=(-p"${MYSQL_ROOT_PASSWORD}")
+}
+
+main() {
+  collect_vars "$@"
+
+  readonly TRILLIAN_PATH=$(go list -f '{{.Dir}}' github.com/google/trillian)
+
+  echo "Warning: about to destroy and reset database '${MYSQL_DATABASE}'"
+  echo "Resetting DB..."
+  mysql "${FLAGS[@]}" -e "DROP DATABASE IF EXISTS ${MYSQL_DATABASE};" || \
+  die "Error: Failed to drop database '${MYSQL_DATABASE}'."
+  mysql "${FLAGS[@]}" -e "CREATE DATABASE ${MYSQL_DATABASE};" || \
+  die "Error: Failed to create database '${MYSQL_DATABASE}'."
+  mysql "${FLAGS[@]}" -e "CREATE USER IF NOT EXISTS ${MYSQL_USER}@'${MYSQL_USER_HOST}' IDENTIFIED BY '${MYSQL_PASSWORD}';" || \
+  die "Error: Failed to create user '${MYSQL_USER}@${MYSQL_USER_HOST}'."
+  mysql "${FLAGS[@]}" -e "GRANT ALL ON ${MYSQL_DATABASE}.* TO ${MYSQL_USER}@'${MYSQL_USER_HOST}'" || \
+  die "Error: Failed to grant '${MYSQL_USER}' user all privileges on '${MYSQL_DATABASE}'."
+  mysql "${FLAGS[@]}" -D ${MYSQL_DATABASE} < ${TRILLIAN_PATH}/storage/mysql/schema/storage.sql || \
+  die "Error: Failed to create tables in '${MYSQL_DATABASE}' database."
+  echo "Reset Complete"
+}
+
+main "$@"
+
+docker exec -i ctfe-db mariadb -pzaphod -Dtest < ./trillian/storage/mysql/schema/storage.sql
+docker exec -i ctfe-db mariadb -pzaphod -Dtest < ./certificate-transparency-go/trillian/ctfe/storage/mysql/schema.sql
+
+CTFE_CONF_DIR=/tmp/ctfedocker
+if [ ! -d $CTFE_CONF_DIR ]; then
+  mkdir ${CTFE_CONF_DIR}
+fi
+
+TREE_ID=$(go run github.com/google/trillian/cmd/createtree@master --admin_server=127.0.0.1:8090)
+sed "s/@TREE_ID@/${TREE_ID}/" ./certificate-transparency-go/trillian/examples/deployment/docker/ctfe/ct_server.cfg > ${CTFE_CONF_DIR}/ct_server.cfg
+cp ./certificate-transparency-go/trillian/testdata/fake-ca.cert ${CTFE_CONF_DIR}
+docker volume create --driver local --opt type=none --opt device=${CTFE_CONF_DIR} --opt o=bind ctfe_config
+
+pushd ./certificate-transparency-go/trillian/examples/deployment/docker/ctfe/
+docker compose down
+docker compose --profile frontend up -d
+sleep 30
+popd
+
+docker ps
+
+popd
+go test -tags=ct_e2e -v -race ./pkg/test/ct_e2e/...
+
+pushd $HOME
+pushd ./certificate-transparency-go/trillian/examples/deployment/docker/ctfe/
+docker compose down
+popd
\ No newline at end of file