diff --git a/src/core_modules/capture-core/components/D2Form/D2Section.component.js b/src/core_modules/capture-core/components/D2Form/D2Section.component.js
index e0cf89264c..d9a58c009d 100644
--- a/src/core_modules/capture-core/components/D2Form/D2Section.component.js
+++ b/src/core_modules/capture-core/components/D2Form/D2Section.component.js
@@ -74,6 +74,7 @@ class D2SectionPlain extends React.PureComponent<Props> {
 
     renderSection(sectionProps) {
         const { sectionMetaData, classes, sectionId, ...passOnProps } = sectionProps;
+        const { applyCustomFormClass } = this.props;
 
         if (!sectionMetaData.showContainer || this.props.formHorizontal) {
             return (
@@ -87,7 +88,10 @@ class D2SectionPlain extends React.PureComponent<Props> {
             );
         }
         return (
-            <div>
+            <div
+                className={applyCustomFormClass ? this.props.classes.containerCustomForm : ''}
+                data-test="d2-form-component"
+            >
                 <Section
                     header={this.renderSectionHeader()}
                     description={this.renderSectionDescription()}
@@ -109,20 +113,17 @@ class D2SectionPlain extends React.PureComponent<Props> {
     }
 
     render() {
-        const { isHidden, applyCustomFormClass, ...passOnProps } = this.props;
+        const { isHidden, ...passOnProps } = this.props;
 
         if (isHidden) {
             return null;
         }
 
-        return (<div
-            data-test="d2-form-component"
-            className={applyCustomFormClass ? this.props.classes.containerCustomForm : ''}
-        >
-            {
-                this.renderSection(passOnProps)
-            }
-        </div>);
+        return (
+            <React.Fragment>
+                {this.renderSection(passOnProps)}
+            </React.Fragment>
+        );
     }
 }
 
diff --git a/src/core_modules/capture-core/components/D2Form/D2SectionFields.component.js b/src/core_modules/capture-core/components/D2Form/D2SectionFields.component.js
index 218004f055..bf7e55746e 100644
--- a/src/core_modules/capture-core/components/D2Form/D2SectionFields.component.js
+++ b/src/core_modules/capture-core/components/D2Form/D2SectionFields.component.js
@@ -274,6 +274,7 @@ export class D2SectionFieldsComponent extends Component<Props> {
             <CustomFormHOC
                 formBuilderRef={(instance) => { this.formBuilderInstance = instance; }}
                 id={formId}
+                data-test="dhis2-capture-form"
                 fields={this.getFieldConfigWithRulesEffects()}
                 dataElements={this.formFields}
                 values={values}