diff --git a/components/TextArea.js b/components/TextArea.js
index cbe3cb4c8059..5d59eac0de90 100644
--- a/components/TextArea.js
+++ b/components/TextArea.js
@@ -45,15 +45,15 @@ const Textarea = ({ className, id, labelText, onChange, onClick, ...other }) =>
     },
   };
 
-  const textareaClasses = classNames('bx--textarea__input', className);
+  const textareaClasses = classNames('bx--text-area', className);
   const label = labelText ? (
-    <label htmlFor={id} className="bx--form__label">
+    <label htmlFor={id} className="bx--label">
       {labelText}
     </label>
   ) : null;
 
   return (
-    <div>
+    <div className="bx--form-item">
       {label}
       <textarea
         {...other}
diff --git a/components/__tests__/TextArea-test.js b/components/__tests__/TextArea-test.js
index 108e298a6c1a..6f505bdfb356 100644
--- a/components/__tests__/TextArea-test.js
+++ b/components/__tests__/TextArea-test.js
@@ -17,7 +17,7 @@ describe('Textarea', () => {
       });
 
       it('has the expected classes', () => {
-        expect(textarea.hasClass('bx--textarea__input')).toEqual(true);
+        expect(textarea.hasClass('bx--text-area')).toEqual(true);
       });
 
       it('applies extra classes specified via className', () => {
@@ -76,7 +76,7 @@ describe('Textarea', () => {
       });
 
       it('has the expected classes', () => {
-        expect(renderedLabel.hasClass('bx--form__label')).toEqual(true);
+        expect(renderedLabel.hasClass('bx--label')).toEqual(true);
       });
     });
   });