diff --git a/awx/ui/src/screens/Host/HostList/HostListItem.js b/awx/ui/src/screens/Host/HostList/HostListItem.js
index 87f0bff39d..6bf291a979 100644
--- a/awx/ui/src/screens/Host/HostList/HostListItem.js
+++ b/awx/ui/src/screens/Host/HostList/HostListItem.js
@@ -85,6 +85,7 @@ function HostListItem({
           <ExpandableRowContent>
             <DetailList gutter="sm">
               <Detail
+                dataCy={`${host.name}-activity`}
                 label={t`Activity`}
                 value={
                   recentJobs.length > 0 ? (
diff --git a/awx/ui/src/screens/Template/Survey/SurveyList.test.js b/awx/ui/src/screens/Template/Survey/SurveyList.test.js
index 7df31c5c00..3e40e4230e 100644
--- a/awx/ui/src/screens/Template/Survey/SurveyList.test.js
+++ b/awx/ui/src/screens/Template/Survey/SurveyList.test.js
@@ -12,6 +12,7 @@ const surveyData = {
   description: 'description for survey',
   spec: [
     { question_name: 'Foo', type: 'text', default: 'Bar', variable: 'foo' },
+    { question_name: 'Bizz', type: 'text', default: 'bazz', variable: 'bizz' },
   ],
 };
 
diff --git a/awx/ui/src/screens/Template/Survey/SurveyListItem.js b/awx/ui/src/screens/Template/Survey/SurveyListItem.js
index 35dbe01118..c2ebfd3ebb 100644
--- a/awx/ui/src/screens/Template/Survey/SurveyListItem.js
+++ b/awx/ui/src/screens/Template/Survey/SurveyListItem.js
@@ -25,6 +25,7 @@ function SurveyListItem({ canEdit, question, isChecked, onSelect, rowIndex }) {
   return (
     <Tr>
       <Td
+        data-cy={`${question.variable}-select`}
         select={{
           rowIndex,
           isSelected: isChecked,
@@ -32,7 +33,11 @@ function SurveyListItem({ canEdit, question, isChecked, onSelect, rowIndex }) {
         }}
         dataLabel={t`Selected`}
       />
-      <Td id={`survey-list-item-${question.variable}`} dataLabel={t`Name`}>
+      <Td
+        data-cy={`${question.variable}-name`}
+        id={`survey-list-item-${question.variable}`}
+        dataLabel={t`Name`}
+      >
         <>
           <Link
             to={`survey/edit?question_variable=${encodeURIComponent(
@@ -52,7 +57,9 @@ function SurveyListItem({ canEdit, question, isChecked, onSelect, rowIndex }) {
           )}
         </>
       </Td>
-      <Td dataLabel={t`Type`}>{question.type}</Td>
+      <Td data-cy={`${question.variable}-type`} dataLabel={t`Type`}>
+        {question.type}
+      </Td>
       <Td dataLabel={t`Default`}>
         {[question.type].includes('password') && (
           <span>{t`encrypted`.toUpperCase()}</span>