diff --git a/src-docs/src/views/tables/basic/basic.js b/src-docs/src/views/tables/basic/basic.js
index ca6f08f0c8dc..dbe7c930fd0c 100644
--- a/src-docs/src/views/tables/basic/basic.js
+++ b/src-docs/src/views/tables/basic/basic.js
@@ -91,11 +91,12 @@ export const Table = () => {
     };
   };
 
-  const getCellProps = (item, column, columnIndex) => {
+  const getCellProps = (item, column) => {
     const { id } = item;
+    const { field } = column;
     return {
       className: 'customCellClass',
-      'data-test-subj': `cell-${id}-${columnIndex}`,
+      'data-test-subj': `cell-${id}-${field}`,
     };
   };
 
diff --git a/src/components/basic_table/__snapshots__/basic_table.test.js.snap b/src/components/basic_table/__snapshots__/basic_table.test.js.snap
index e3c98dd8fe49..b6e91edcfa26 100644
--- a/src/components/basic_table/__snapshots__/basic_table.test.js.snap
+++ b/src/components/basic_table/__snapshots__/basic_table.test.js.snap
@@ -28,7 +28,7 @@ exports[`EuiBasicTable cellProps renders cells with custom props from a callback
             <EuiTableRowCell
               align="left"
               className="customRowClass"
-              data-test-subj="cell-1-0-name"
+              data-test-subj="cell-1-name"
               header="Name"
               key="_data_column_name_0_0"
               onClick={[Function]}
@@ -47,7 +47,7 @@ exports[`EuiBasicTable cellProps renders cells with custom props from a callback
             <EuiTableRowCell
               align="left"
               className="customRowClass"
-              data-test-subj="cell-2-0-name"
+              data-test-subj="cell-2-name"
               header="Name"
               key="_data_column_name_1_0"
               onClick={[Function]}
@@ -66,7 +66,7 @@ exports[`EuiBasicTable cellProps renders cells with custom props from a callback
             <EuiTableRowCell
               align="left"
               className="customRowClass"
-              data-test-subj="cell-3-0-name"
+              data-test-subj="cell-3-name"
               header="Name"
               key="_data_column_name_2_0"
               onClick={[Function]}
diff --git a/src/components/basic_table/basic_table.js b/src/components/basic_table/basic_table.js
index 2f287795a017..50d0d355ba2e 100644
--- a/src/components/basic_table/basic_table.js
+++ b/src/components/basic_table/basic_table.js
@@ -169,10 +169,10 @@ function getRowProps(item, rowProps) {
   return {};
 }
 
-function getCellProps(item, column, columnIndex, cellProps) {
+function getCellProps(item, column, cellProps) {
   if (cellProps) {
     if (isFunction(cellProps)) {
-      return cellProps(item, column, columnIndex);
+      return cellProps(item, column);
     }
     return cellProps;
   }
@@ -681,7 +681,7 @@ export class EuiBasicTable extends Component {
     const content = contentRenderer(value, item);
 
     const { cellProps: cellPropsCallback } = this.props;
-    const cellProps = getCellProps(item, column, columnIndex, cellPropsCallback);
+    const cellProps = getCellProps(item, column, cellPropsCallback);
 
     return (
       <EuiTableRowCell
diff --git a/src/components/basic_table/basic_table.test.js b/src/components/basic_table/basic_table.test.js
index c89f0bb86fee..6a87659d3116 100644
--- a/src/components/basic_table/basic_table.test.js
+++ b/src/components/basic_table/basic_table.test.js
@@ -156,11 +156,11 @@ describe('EuiBasicTable', () => {
             description: 'description'
           }
         ],
-        cellProps: (item, column, columnIndex) => {
+        cellProps: (item, column) => {
           const { id } = item;
           const { field } = column;
           return {
-            'data-test-subj': `cell-${id}-${columnIndex}-${field}`,
+            'data-test-subj': `cell-${id}-${field}`,
             className: 'customRowClass',
             onClick: () => {},
           };