diff --git a/src/forms/OptionalDirectory.jsx b/src/forms/OptionalDirectory.jsx
index 9060477..9150f63 100644
--- a/src/forms/OptionalDirectory.jsx
+++ b/src/forms/OptionalDirectory.jsx
@@ -35,6 +35,7 @@ export function OptionalDirectory(component, label, name, props = {}) {
                 size="sm"
                 name={name}
                 value={stateProperty(component, name)}
+                data-testid={'control-' + name}
                 onChange={component.handleChange}{...props}></FormControl>
             {window.kopiaUI &&
                 <Button size="sm" onClick={() => window.kopiaUI.selectDirectory(onDirectorySelected)}>
diff --git a/src/forms/RequiredDirectory.jsx b/src/forms/RequiredDirectory.jsx
index d279681..a02587b 100644
--- a/src/forms/RequiredDirectory.jsx
+++ b/src/forms/RequiredDirectory.jsx
@@ -36,6 +36,7 @@ export function RequiredDirectory(component, label, name, props = {}) {
                 name={name}
                 isInvalid={stateProperty(component, name, null) === ''}
                 value={stateProperty(component, name)}
+                data-testid={'control-' + name}
                 onChange={component.handleChange}{...props}></FormControl>
             {window.kopiaUI &&
                 <Button size="sm" onClick={() => window.kopiaUI.selectDirectory(onDirectorySelected)}>