diff --git a/entity-types/infra-ociautonomousdatabasetest/definition.yml b/entity-types/infra-ociautonomousdatabasetest/definition.yml
new file mode 100644
index 000000000..d85c055c4
--- /dev/null
+++ b/entity-types/infra-ociautonomousdatabasetest/definition.yml
@@ -0,0 +1,35 @@
+domain: INFRA
+type: OCIAUTONOMOUSDATABASETEST
+goldenTags:
+  - oci.availabilityDomain
+  - oci.availableUpgradeVersions
+  - oci.compartmentId
+  - oci.dbName
+  - oci.displayName
+  - oci.lifecycleState
+  - oci.subscriptionId
+  - oci.dbVersion
+  - oci.infrastructureType
+configuration:
+  entityExpirationTime: DAILY
+  alertable: true
+synthesis:
+  tags:
+    newrelic.cloudIntegrations.providerAccountName:
+      entityTagNames: [newrelic.cloudIntegrations.providerAccountName, providerAccountName]
+      multiValue: false
+  rules:
+  - ruleName: infra_ociautonomousdatabasetest_oci_resourceId
+    identifier: oci.resourceId
+    name: oci.resourceName
+    legacyFeatures:
+      overrideGuidType: true
+    encodeIdentifierInGUID: true
+    conditions:
+    - attribute: oci.resourceId
+      prefix: "OCID1.AUTONOMOUSDATABASE"
+    - attribute: oci.namespace
+      value: "oci_autonomous_database_test"
+ownership:
+  primaryOwner:
+    teamName: "Cloud Monitoring Platform"
\ No newline at end of file
diff --git a/entity-types/infra-ociautonomousdatabasetest/golden_metrics.yml b/entity-types/infra-ociautonomousdatabasetest/golden_metrics.yml
new file mode 100644
index 000000000..7b10df590
--- /dev/null
+++ b/entity-types/infra-ociautonomousdatabasetest/golden_metrics.yml
@@ -0,0 +1,24 @@
+queryLatency:
+  title: Query Latency
+  unit: SECONDS
+  queries:
+    oci:
+      select: average(oci.autonomousdatabasetest.query.latency)
+transactionCount:
+  title: Transaction Count
+  unit: COUNT
+  queries:
+    oci:
+      select: sum(oci.autonomousdatabasetest.transaction.count)
+failedConnections:
+  title: Failed Connections
+  unit: COUNT
+  queries:
+    oci:
+      select: sum(oci.autonomousdatabasetest.failed.connections)
+queuedStatements:
+  title: Queued Statements
+  unit: COUNT
+  queries:
+    oci:
+      select: max(oci.autonomousdatabasetest.queued.statements)
\ No newline at end of file
diff --git a/entity-types/infra-ociautonomousdatabasetest/summary_metrics.yml b/entity-types/infra-ociautonomousdatabasetest/summary_metrics.yml
new file mode 100644
index 000000000..64fc4675d
--- /dev/null
+++ b/entity-types/infra-ociautonomousdatabasetest/summary_metrics.yml
@@ -0,0 +1,21 @@
+providerAccountName:
+  tag:
+    key: providerAccountName
+  title: OCI account
+  unit: STRING
+queryLatency:
+  goldenMetric: queryLatency
+  unit: SECONDS
+  title: Query Latency
+transactionCount:
+  goldenMetric: transactionCount
+  unit: COUNT
+  title: Transaction Count
+failedConnections:
+  goldenMetric: failedConnections
+  unit: COUNT
+  title: Failed Connections
+queuedStatements:
+  goldenMetric: queuedStatements
+  unit: COUNT
+  title: Queued Statements
\ No newline at end of file
diff --git a/entity-types/infra-ociautonomousdatabasetest/tests/Metric.json b/entity-types/infra-ociautonomousdatabasetest/tests/Metric.json
new file mode 100644
index 000000000..4d4f040cd
--- /dev/null
+++ b/entity-types/infra-ociautonomousdatabasetest/tests/Metric.json
@@ -0,0 +1,22 @@
+[
+  {
+    "oci.availabilityDomain": "AD-1",
+    "oci.availableUpgradeVersions": ["19c", "21c"],
+    "oci.compartmentId": "ocid1.compartment.oc1..exampleuniqueID",
+    "oci.dbName": "AUTONDB1",
+    "oci.displayName": "Test Autonomous DB Test",
+    "oci.lifecycleState": "AVAILABLE",
+    "oci.subscriptionId": "ocid1.subscription.oc1..exampleuniqueSubID",
+    "oci.dbVersion": "19c",
+    "oci.infrastructureType": "CLOUD",
+    "oci.namespace": "oci_autonomous_database_test",
+    "oci.region": "us-ashburn-1",
+    "oci.resourceId": "OCID1.AUTONOMOUSDATABASE.OC1.US-ASHBURN-1.EXAMPLEUNIQUEID",
+    "oci.resourceName": "test-autonomous-db-test",
+    "collector.name": "oci-monitor",
+    "instrumentation.provider": "oci",
+    "metricName": "oci.autonomousdatabasetest.connections",
+    "newrelic.cloudIntegrations.integrationName": "OCI Monitor metrics",
+    "newrelic.cloudIntegrations.providerAccountName": "oci-dev-all-metrics"
+  }
+]
\ No newline at end of file