diff --git a/collect_app/src/main/java/org/odk/collect/android/formhierarchy/QuestionAnswerProcessor.kt b/collect_app/src/main/java/org/odk/collect/android/formhierarchy/QuestionAnswerProcessor.kt
index fbc705f9e2c..3604bda99a7 100644
--- a/collect_app/src/main/java/org/odk/collect/android/formhierarchy/QuestionAnswerProcessor.kt
+++ b/collect_app/src/main/java/org/odk/collect/android/formhierarchy/QuestionAnswerProcessor.kt
@@ -27,11 +27,8 @@ object QuestionAnswerProcessor {
 
         if (!fep.answerText.isNullOrBlank() &&
             Appearances.isMasked(fep) &&
-            fep.controlType == Constants.CONTROL_INPUT && (
-                fep.dataType == Constants.DATATYPE_TEXT ||
-                    fep.dataType == Constants.DATATYPE_INTEGER ||
-                    fep.dataType == Constants.DATATYPE_DECIMAL
-            )
+            fep.controlType == Constants.CONTROL_INPUT &&
+            fep.dataType == Constants.DATATYPE_TEXT
         ) {
             return "••••••••••"
         }
diff --git a/collect_app/src/main/java/org/odk/collect/android/utilities/Appearances.kt b/collect_app/src/main/java/org/odk/collect/android/utilities/Appearances.kt
index 5ae33fb4666..78d4067709f 100644
--- a/collect_app/src/main/java/org/odk/collect/android/utilities/Appearances.kt
+++ b/collect_app/src/main/java/org/odk/collect/android/utilities/Appearances.kt
@@ -16,6 +16,7 @@
 package org.odk.collect.android.utilities
 
 import android.content.res.Configuration
+import org.javarosa.core.model.Constants
 import org.javarosa.form.api.FormEntryPrompt
 import org.odk.collect.android.dynamicpreload.ExternalDataUtil
 import org.odk.collect.androidshared.utils.ScreenUtils
@@ -195,6 +196,6 @@ object Appearances {
     @JvmStatic
     fun isMasked(prompt: FormEntryPrompt): Boolean {
         val appearance = getSanitizedAppearanceHint(prompt)
-        return appearance.contains(MASKED)
+        return appearance.contains(MASKED) && prompt.dataType == Constants.DATATYPE_TEXT
     }
 }
diff --git a/collect_app/src/test/java/org/odk/collect/android/formhierarchy/QuestionAnswerProcessorTest.kt b/collect_app/src/test/java/org/odk/collect/android/formhierarchy/QuestionAnswerProcessorTest.kt
index b7774d5a114..d615b0f6023 100644
--- a/collect_app/src/test/java/org/odk/collect/android/formhierarchy/QuestionAnswerProcessorTest.kt
+++ b/collect_app/src/test/java/org/odk/collect/android/formhierarchy/QuestionAnswerProcessorTest.kt
@@ -27,73 +27,57 @@ class QuestionAnswerProcessorTest {
     }
 
     @Test
-    fun noAnswerShouldBeDisplayedIfItDoesNotExistAndMaskedAppearanceIsUsedForTextAndNumberDataTypes() {
-        listOf(
-            Constants.DATATYPE_TEXT,
-            Constants.DATATYPE_INTEGER,
-            Constants.DATATYPE_DECIMAL
-        ).forEach {
-            val question = mock<QuestionDef>()
-            val prompt = MockFormEntryPromptBuilder()
-                .withQuestion(question)
-                .withDataType(it)
-                .withControlType(Constants.CONTROL_INPUT)
-                .withAppearance(Appearances.MASKED)
-                .build()
+    fun noAnswerShouldBeDisplayedIfItDoesNotExistAndMaskedAppearanceIsUsedForTextDataTypes() {
+        val question = mock<QuestionDef>()
+        val prompt = MockFormEntryPromptBuilder()
+            .withQuestion(question)
+            .withDataType(Constants.DATATYPE_TEXT)
+            .withControlType(Constants.CONTROL_INPUT)
+            .withAppearance(Appearances.MASKED)
+            .build()
 
-            val answer = QuestionAnswerProcessor.getQuestionAnswer(prompt, mock(), mock())
+        val answer = QuestionAnswerProcessor.getQuestionAnswer(prompt, mock(), mock())
 
-            assertThat(answer, equalTo(""))
-        }
+        assertThat(answer, equalTo(""))
     }
 
     @Test
-    fun noAnswerShouldBeDisplayedIfItIsEmptyAndMaskedAppearanceIsUsedForTextAndNumberDataTypes() {
-        listOf(
-            Constants.DATATYPE_TEXT,
-            Constants.DATATYPE_INTEGER,
-            Constants.DATATYPE_DECIMAL
-        ).forEach {
-            val question = mock<QuestionDef>()
-            val prompt = MockFormEntryPromptBuilder()
-                .withQuestion(question)
-                .withAnswerDisplayText("")
-                .withAppearance(Appearances.MASKED)
-                .withControlType(Constants.CONTROL_INPUT)
-                .withDataType(it)
-                .build()
+    fun noAnswerShouldBeDisplayedIfItIsEmptyAndMaskedAppearanceIsUsedForTextDataTypes() {
+        val question = mock<QuestionDef>()
+        val prompt = MockFormEntryPromptBuilder()
+            .withQuestion(question)
+            .withAnswerDisplayText("")
+            .withAppearance(Appearances.MASKED)
+            .withControlType(Constants.CONTROL_INPUT)
+            .withDataType(Constants.DATATYPE_TEXT)
+            .build()
 
-            val answer = QuestionAnswerProcessor.getQuestionAnswer(prompt, mock(), mock())
+        val answer = QuestionAnswerProcessor.getQuestionAnswer(prompt, mock(), mock())
 
-            assertThat(answer, equalTo(""))
-        }
+        assertThat(answer, equalTo(""))
     }
 
     @Test
-    fun maskedAnswerShouldBeDisplayedIfItExistAndMaskedAppearanceIsUsedForTextAndNumberDataTypes() {
-        listOf(
-            Constants.DATATYPE_TEXT,
-            Constants.DATATYPE_INTEGER,
-            Constants.DATATYPE_DECIMAL
-        ).forEach {
-            val question = mock<QuestionDef>()
-            val prompt = MockFormEntryPromptBuilder()
-                .withQuestion(question)
-                .withAnswerDisplayText("blah")
-                .withAppearance(Appearances.MASKED)
-                .withControlType(Constants.CONTROL_INPUT)
-                .withDataType(it)
-                .build()
+    fun maskedAnswerShouldBeDisplayedIfItExistAndMaskedAppearanceIsUsedForTextDataTypes() {
+        val question = mock<QuestionDef>()
+        val prompt = MockFormEntryPromptBuilder()
+            .withQuestion(question)
+            .withAnswerDisplayText("blah")
+            .withAppearance(Appearances.MASKED)
+            .withControlType(Constants.CONTROL_INPUT)
+            .withDataType(Constants.DATATYPE_TEXT)
+            .build()
 
-            val answer = QuestionAnswerProcessor.getQuestionAnswer(prompt, mock(), mock())
+        val answer = QuestionAnswerProcessor.getQuestionAnswer(prompt, mock(), mock())
 
-            assertThat(answer, equalTo("••••••••••"))
-        }
+        assertThat(answer, equalTo("••••••••••"))
     }
 
     @Test
-    fun originalAnswerShouldBeDisplayedIfItExistAndMaskedAppearanceIsUsedForDataTypesOtherThanTextAndNumber() {
+    fun originalAnswerShouldBeDisplayedIfItExistAndMaskedAppearanceIsUsedForDataTypesOtherThanText() {
         listOf(
+            Constants.DATATYPE_INTEGER,
+            Constants.DATATYPE_DECIMAL,
             Constants.DATATYPE_DATE_TIME,
             Constants.DATATYPE_DATE,
             Constants.DATATYPE_TIME,
@@ -120,7 +104,7 @@ class QuestionAnswerProcessorTest {
     }
 
     @Test
-    fun originalAnswerShouldBeDisplayedIfItExistAndMaskedAppearanceIsUsedButControlTypeIsOtherThanInput() {
+    fun originalAnswerShouldBeDisplayedIfItExistAndMaskedAppearanceIsUsedForDataTypesAndControlTypeOtherThanInput() {
         listOf(
             Constants.CONTROL_RANGE,
             Constants.CONTROL_RANK,
diff --git a/collect_app/src/test/java/org/odk/collect/android/utilities/AppearancesTest.kt b/collect_app/src/test/java/org/odk/collect/android/utilities/AppearancesTest.kt
index e389e0090fb..aa718aa2363 100644
--- a/collect_app/src/test/java/org/odk/collect/android/utilities/AppearancesTest.kt
+++ b/collect_app/src/test/java/org/odk/collect/android/utilities/AppearancesTest.kt
@@ -19,6 +19,7 @@ import android.content.res.Configuration
 import junit.framework.TestCase.assertEquals
 import junit.framework.TestCase.assertFalse
 import junit.framework.TestCase.assertTrue
+import org.javarosa.core.model.Constants
 import org.javarosa.form.api.FormEntryPrompt
 import org.junit.Test
 import org.mockito.kotlin.mock
@@ -233,7 +234,8 @@ class AppearancesTest {
     }
 
     @Test
-    fun `useThousandSeparator returns false when 'thousands-sep' appearance is found but mixed with 'masked'`() {
+    fun `useThousandSeparator returns false when 'thousands-sep' appearance is found but mixed with 'masked' for text questions`() {
+        whenever(formEntryPrompt.dataType).thenReturn(Constants.DATATYPE_TEXT)
         whenever(formEntryPrompt.appearanceHint).thenReturn("thousands-sep masked")
         assertFalse(Appearances.useThousandSeparator(formEntryPrompt))
     }
@@ -369,6 +371,7 @@ class AppearancesTest {
 
     @Test
     fun `isMasked returns false when there is no appearance`() {
+        whenever(formEntryPrompt.dataType).thenReturn(Constants.DATATYPE_TEXT)
         assertFalse(Appearances.isMasked(formEntryPrompt))
 
         whenever(formEntryPrompt.appearanceHint).thenReturn("")
@@ -377,13 +380,25 @@ class AppearancesTest {
 
     @Test
     fun `isMasked returns false when non of supported appearances is found`() {
+        whenever(formEntryPrompt.dataType).thenReturn(Constants.DATATYPE_TEXT)
         whenever(formEntryPrompt.appearanceHint).thenReturn("blah")
         assertFalse(Appearances.isMasked(formEntryPrompt))
     }
 
     @Test
-    fun `isMasked returns true when 'masked' appearance is found`() {
+    fun `isMasked returns true when 'masked' appearance is found for text questions`() {
+        whenever(formEntryPrompt.dataType).thenReturn(Constants.DATATYPE_TEXT)
         whenever(formEntryPrompt.appearanceHint).thenReturn("masked")
         assertTrue(Appearances.isMasked(formEntryPrompt))
     }
+
+    @Test
+    fun `isMasked returns false when 'masked' appearance is found for numeric questions`() {
+        whenever(formEntryPrompt.dataType).thenReturn(Constants.DATATYPE_INTEGER)
+        whenever(formEntryPrompt.appearanceHint).thenReturn("masked")
+        assertFalse(Appearances.isMasked(formEntryPrompt))
+
+        whenever(formEntryPrompt.dataType).thenReturn(Constants.DATATYPE_DECIMAL)
+        assertFalse(Appearances.isMasked(formEntryPrompt))
+    }
 }
diff --git a/collect_app/src/test/java/org/odk/collect/android/widgets/DecimalWidgetTest.java b/collect_app/src/test/java/org/odk/collect/android/widgets/DecimalWidgetTest.java
index cd1293f7596..baeed76c95a 100644
--- a/collect_app/src/test/java/org/odk/collect/android/widgets/DecimalWidgetTest.java
+++ b/collect_app/src/test/java/org/odk/collect/android/widgets/DecimalWidgetTest.java
@@ -2,12 +2,14 @@
 
 import androidx.annotation.NonNull;
 
+import org.javarosa.core.model.Constants;
 import org.javarosa.core.model.QuestionDef;
 import org.javarosa.core.model.data.DecimalData;
 import org.javarosa.core.model.data.IAnswerData;
 import org.junit.Test;
 import org.mockito.Mock;
 import org.odk.collect.android.formentry.questions.QuestionDetails;
+import org.odk.collect.android.utilities.Appearances;
 import org.odk.collect.android.widgets.base.GeneralStringWidgetTest;
 
 import java.text.NumberFormat;
@@ -15,12 +17,13 @@
 import java.util.Random;
 
 import static junit.framework.TestCase.assertEquals;
+import static org.hamcrest.CoreMatchers.not;
 import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.instanceOf;
 import static org.hamcrest.core.Is.is;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertThat;
 import static org.mockito.Mockito.when;
-import static org.odk.collect.android.utilities.Appearances.MASKED;
 import static org.odk.collect.android.utilities.Appearances.THOUSANDS_SEP;
 
 import android.text.InputType;
@@ -40,6 +43,7 @@ public class DecimalWidgetTest extends GeneralStringWidgetTest<DecimalWidget, De
     @NonNull
     @Override
     public DecimalWidget createWidget() {
+        when(formEntryPrompt.getDataType()).thenReturn(Constants.DATATYPE_DECIMAL);
         return new DecimalWidget(activity, new QuestionDetails(formEntryPrompt, readOnlyOverride));
     }
 
@@ -219,12 +223,11 @@ public void verifyInputType() {
         assertThat(widget.widgetAnswerText.getBinding().editText.getTransformationMethod().getClass(), equalTo(SingleLineTransformationMethod.class));
     }
 
-    @Override
     @Test
-    public void verifyInputTypeWithMaskedAppearance() {
-        when(formEntryPrompt.getAppearanceHint()).thenReturn(MASKED);
-        DecimalWidget widget = getWidget();
-        assertThat(widget.widgetAnswerText.getBinding().editText.getInputType(), equalTo(InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_FLAG_SIGNED | InputType.TYPE_NUMBER_FLAG_DECIMAL));
-        assertThat(widget.widgetAnswerText.getBinding().editText.getTransformationMethod().getClass(), equalTo(PasswordTransformationMethod.class));
+    public void answersShouldNotBeMaskedIfMaskedAppearanceIsUsed() {
+        when(formEntryPrompt.getAppearanceHint()).thenReturn(Appearances.MASKED);
+
+        assertThat(getSpyWidget().widgetAnswerText.getBinding().editText.getTransformationMethod(), is(not(instanceOf(PasswordTransformationMethod.class))));
+        assertThat(getSpyWidget().widgetAnswerText.getBinding().textView.getTransformationMethod(), is(not(instanceOf(PasswordTransformationMethod.class))));
     }
 }
diff --git a/collect_app/src/test/java/org/odk/collect/android/widgets/ExDecimalWidgetTest.java b/collect_app/src/test/java/org/odk/collect/android/widgets/ExDecimalWidgetTest.java
index f43b8350def..89d281291d6 100644
--- a/collect_app/src/test/java/org/odk/collect/android/widgets/ExDecimalWidgetTest.java
+++ b/collect_app/src/test/java/org/odk/collect/android/widgets/ExDecimalWidgetTest.java
@@ -2,11 +2,13 @@
 
 import androidx.annotation.NonNull;
 
+import org.javarosa.core.model.Constants;
 import org.javarosa.core.model.data.DecimalData;
 import org.odk.collect.android.formentry.questions.QuestionDetails;
 import org.javarosa.core.model.data.IAnswerData;
 import org.junit.Test;
 import org.mockito.Mock;
+import org.odk.collect.android.utilities.Appearances;
 import org.odk.collect.android.widgets.base.GeneralExStringWidgetTest;
 import org.odk.collect.android.widgets.support.FakeWaitingForDataRegistry;
 import org.odk.collect.android.widgets.utilities.StringRequester;
@@ -16,11 +18,12 @@
 
 import static junit.framework.TestCase.assertEquals;
 import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.instanceOf;
+import static org.hamcrest.Matchers.not;
 import static org.hamcrest.core.Is.is;
 import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertThat;
 import static org.mockito.Mockito.when;
-import static org.odk.collect.android.utilities.Appearances.MASKED;
 import static org.odk.collect.android.utilities.Appearances.THOUSANDS_SEP;
 
 import android.text.InputType;
@@ -42,6 +45,7 @@ public class ExDecimalWidgetTest extends GeneralExStringWidgetTest<ExDecimalWidg
     @NonNull
     @Override
     public ExDecimalWidget createWidget() {
+        when(formEntryPrompt.getDataType()).thenReturn(Constants.DATATYPE_DECIMAL);
         return new ExDecimalWidget(activity, new QuestionDetails(formEntryPrompt), new FakeWaitingForDataRegistry(), stringRequester);
     }
 
@@ -103,13 +107,11 @@ public void verifyInputType() {
         assertThat(widget.binding.widgetAnswerText.getBinding().textView.getTransformationMethod(), equalTo(null));
     }
 
-    @Override
     @Test
-    public void verifyInputTypeWithMaskedAppearance() {
-        when(formEntryPrompt.getAppearanceHint()).thenReturn(MASKED);
-        ExDecimalWidget widget = getWidget();
-        assertThat(widget.binding.widgetAnswerText.getBinding().editText.getInputType(), equalTo(InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_FLAG_SIGNED | InputType.TYPE_NUMBER_FLAG_DECIMAL));
-        assertThat(widget.binding.widgetAnswerText.getBinding().editText.getTransformationMethod().getClass(), equalTo(PasswordTransformationMethod.class));
-        assertThat(widget.binding.widgetAnswerText.getBinding().textView.getTransformationMethod().getClass(), equalTo(PasswordTransformationMethod.class));
+    public void answersShouldNotBeMaskedIfMaskedAppearanceIsUsed() {
+        when(formEntryPrompt.getAppearanceHint()).thenReturn(Appearances.MASKED);
+
+        assertThat(getSpyWidget().binding.widgetAnswerText.getBinding().editText.getTransformationMethod(), is(not(instanceOf(PasswordTransformationMethod.class))));
+        assertThat(getSpyWidget().binding.widgetAnswerText.getBinding().textView.getTransformationMethod(), is(not(instanceOf(PasswordTransformationMethod.class))));
     }
 }
diff --git a/collect_app/src/test/java/org/odk/collect/android/widgets/ExIntegerWidgetTest.java b/collect_app/src/test/java/org/odk/collect/android/widgets/ExIntegerWidgetTest.java
index 78ee7883628..ba99b0013ec 100644
--- a/collect_app/src/test/java/org/odk/collect/android/widgets/ExIntegerWidgetTest.java
+++ b/collect_app/src/test/java/org/odk/collect/android/widgets/ExIntegerWidgetTest.java
@@ -2,10 +2,12 @@
 
 import androidx.annotation.NonNull;
 
+import org.javarosa.core.model.Constants;
 import org.javarosa.core.model.data.IntegerData;
 import org.mockito.Mock;
 import org.odk.collect.android.formentry.questions.QuestionDetails;
 import org.junit.Test;
+import org.odk.collect.android.utilities.Appearances;
 import org.odk.collect.android.widgets.base.GeneralExStringWidgetTest;
 import org.odk.collect.android.widgets.support.FakeWaitingForDataRegistry;
 import org.odk.collect.android.widgets.utilities.StringRequester;
@@ -13,8 +15,10 @@
 import static junit.framework.TestCase.assertEquals;
 import static org.hamcrest.CoreMatchers.equalTo;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.instanceOf;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.not;
 import static org.mockito.Mockito.when;
-import static org.odk.collect.android.utilities.Appearances.MASKED;
 import static org.odk.collect.android.utilities.Appearances.THOUSANDS_SEP;
 
 import android.text.InputType;
@@ -33,6 +37,7 @@ public class ExIntegerWidgetTest extends GeneralExStringWidgetTest<ExIntegerWidg
     @NonNull
     @Override
     public ExIntegerWidget createWidget() {
+        when(formEntryPrompt.getDataType()).thenReturn(Constants.DATATYPE_INTEGER);
         return new ExIntegerWidget(activity, new QuestionDetails(formEntryPrompt), new FakeWaitingForDataRegistry(), stringRequester);
     }
 
@@ -77,13 +82,11 @@ public void verifyInputType() {
         assertThat(widget.binding.widgetAnswerText.getBinding().textView.getTransformationMethod(), equalTo(null));
     }
 
-    @Override
     @Test
-    public void verifyInputTypeWithMaskedAppearance() {
-        when(formEntryPrompt.getAppearanceHint()).thenReturn(MASKED);
-        ExIntegerWidget widget = getWidget();
-        assertThat(widget.binding.widgetAnswerText.getBinding().editText.getInputType(), equalTo(InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_FLAG_SIGNED));
-        assertThat(widget.binding.widgetAnswerText.getBinding().editText.getTransformationMethod().getClass(), equalTo(PasswordTransformationMethod.class));
-        assertThat(widget.binding.widgetAnswerText.getBinding().textView.getTransformationMethod().getClass(), equalTo(PasswordTransformationMethod.class));
+    public void answersShouldNotBeMaskedIfMaskedAppearanceIsUsed() {
+        when(formEntryPrompt.getAppearanceHint()).thenReturn(Appearances.MASKED);
+
+        assertThat(getSpyWidget().binding.widgetAnswerText.getBinding().editText.getTransformationMethod(), is(not(instanceOf(PasswordTransformationMethod.class))));
+        assertThat(getSpyWidget().binding.widgetAnswerText.getBinding().textView.getTransformationMethod(), is(not(instanceOf(PasswordTransformationMethod.class))));
     }
 }
diff --git a/collect_app/src/test/java/org/odk/collect/android/widgets/ExStringWidgetTest.java b/collect_app/src/test/java/org/odk/collect/android/widgets/ExStringWidgetTest.java
index 0b5059990e6..bebe2da4fde 100644
--- a/collect_app/src/test/java/org/odk/collect/android/widgets/ExStringWidgetTest.java
+++ b/collect_app/src/test/java/org/odk/collect/android/widgets/ExStringWidgetTest.java
@@ -4,16 +4,21 @@
 
 import net.bytebuddy.utility.RandomString;
 
+import org.javarosa.core.model.Constants;
 import org.javarosa.core.model.data.StringData;
 import org.junit.Test;
 import org.mockito.Mock;
 import org.odk.collect.android.formentry.questions.QuestionDetails;
+import org.odk.collect.android.utilities.Appearances;
 import org.odk.collect.android.widgets.base.GeneralExStringWidgetTest;
 import org.odk.collect.android.widgets.support.FakeWaitingForDataRegistry;
 import org.odk.collect.android.widgets.utilities.StringRequester;
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.instanceOf;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.not;
 import static org.mockito.Mockito.when;
 import static org.odk.collect.android.utilities.Appearances.MASKED;
 
@@ -33,6 +38,7 @@ public class ExStringWidgetTest extends GeneralExStringWidgetTest<ExStringWidget
     @NonNull
     @Override
     public ExStringWidget createWidget() {
+        when(formEntryPrompt.getDataType()).thenReturn(Constants.DATATYPE_TEXT);
         return new ExStringWidget(activity, new QuestionDetails(formEntryPrompt), new FakeWaitingForDataRegistry(), stringRequester);
     }
 
@@ -57,7 +63,6 @@ public void verifyInputType() {
         assertThat(widget.binding.widgetAnswerText.getBinding().textView.getTransformationMethod(), equalTo(null));
     }
 
-    @Override
     @Test
     public void verifyInputTypeWithMaskedAppearance() {
         when(formEntryPrompt.getAppearanceHint()).thenReturn(MASKED);
@@ -66,4 +71,18 @@ public void verifyInputTypeWithMaskedAppearance() {
         assertThat(widget.binding.widgetAnswerText.getBinding().editText.getTransformationMethod().getClass(), equalTo(PasswordTransformationMethod.class));
         assertThat(widget.binding.widgetAnswerText.getBinding().textView.getTransformationMethod().getClass(), equalTo(PasswordTransformationMethod.class));
     }
+
+    @Test
+    public void answersShouldNotBeMaskedIfMaskedAppearanceIsNotUsed() {
+        assertThat(getSpyWidget().binding.widgetAnswerText.getBinding().editText.getTransformationMethod(), is(not(instanceOf(PasswordTransformationMethod.class))));
+        assertThat(getSpyWidget().binding.widgetAnswerText.getBinding().textView.getTransformationMethod(), is(not(instanceOf(PasswordTransformationMethod.class))));
+    }
+
+    @Test
+    public void answersShouldBeMaskedIfMaskedAppearanceIsUsed() {
+        when(formEntryPrompt.getAppearanceHint()).thenReturn(Appearances.MASKED);
+
+        assertThat(getSpyWidget().binding.widgetAnswerText.getBinding().editText.getTransformationMethod(), is(instanceOf(PasswordTransformationMethod.class)));
+        assertThat(getSpyWidget().binding.widgetAnswerText.getBinding().textView.getTransformationMethod(), is(instanceOf(PasswordTransformationMethod.class)));
+    }
 }
diff --git a/collect_app/src/test/java/org/odk/collect/android/widgets/IntegerWidgetTest.java b/collect_app/src/test/java/org/odk/collect/android/widgets/IntegerWidgetTest.java
index 1b019474016..8fec8b44717 100644
--- a/collect_app/src/test/java/org/odk/collect/android/widgets/IntegerWidgetTest.java
+++ b/collect_app/src/test/java/org/odk/collect/android/widgets/IntegerWidgetTest.java
@@ -2,16 +2,20 @@
 
 import androidx.annotation.NonNull;
 
+import org.javarosa.core.model.Constants;
 import org.javarosa.core.model.data.IntegerData;
 import org.odk.collect.android.formentry.questions.QuestionDetails;
 import org.junit.Test;
+import org.odk.collect.android.utilities.Appearances;
 import org.odk.collect.android.widgets.base.GeneralStringWidgetTest;
 
 import static junit.framework.TestCase.assertEquals;
 import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.not;
 import static org.hamcrest.MatcherAssert.assertThat;
+import static org.hamcrest.Matchers.instanceOf;
+import static org.hamcrest.core.Is.is;
 import static org.mockito.Mockito.when;
-import static org.odk.collect.android.utilities.Appearances.MASKED;
 import static org.odk.collect.android.utilities.Appearances.THOUSANDS_SEP;
 
 import android.text.InputType;
@@ -26,6 +30,7 @@ public class IntegerWidgetTest extends GeneralStringWidgetTest<IntegerWidget, In
     @NonNull
     @Override
     public IntegerWidget createWidget() {
+        when(formEntryPrompt.getDataType()).thenReturn(Constants.DATATYPE_INTEGER);
         return new IntegerWidget(activity, new QuestionDetails(formEntryPrompt, readOnlyOverride));
     }
 
@@ -63,12 +68,11 @@ public void verifyInputType() {
         assertThat(widget.widgetAnswerText.getBinding().editText.getTransformationMethod().getClass(), equalTo(SingleLineTransformationMethod.class));
     }
 
-    @Override
     @Test
-    public void verifyInputTypeWithMaskedAppearance() {
-        when(formEntryPrompt.getAppearanceHint()).thenReturn(MASKED);
-        IntegerWidget widget = getWidget();
-        assertThat(widget.widgetAnswerText.getBinding().editText.getInputType(), equalTo(InputType.TYPE_CLASS_NUMBER | InputType.TYPE_NUMBER_FLAG_SIGNED));
-        assertThat(widget.widgetAnswerText.getBinding().editText.getTransformationMethod().getClass(), equalTo(PasswordTransformationMethod.class));
+    public void answersShouldNotBeMaskedIfMaskedAppearanceIsUsed() {
+        when(formEntryPrompt.getAppearanceHint()).thenReturn(Appearances.MASKED);
+
+        assertThat(getSpyWidget().widgetAnswerText.getBinding().editText.getTransformationMethod(), is(not(instanceOf(PasswordTransformationMethod.class))));
+        assertThat(getSpyWidget().widgetAnswerText.getBinding().textView.getTransformationMethod(), is(not(instanceOf(PasswordTransformationMethod.class))));
     }
 }
diff --git a/collect_app/src/test/java/org/odk/collect/android/widgets/StringNumberWidgetTest.java b/collect_app/src/test/java/org/odk/collect/android/widgets/StringNumberWidgetTest.java
index 31b189cafb1..ea7b26b4a37 100644
--- a/collect_app/src/test/java/org/odk/collect/android/widgets/StringNumberWidgetTest.java
+++ b/collect_app/src/test/java/org/odk/collect/android/widgets/StringNumberWidgetTest.java
@@ -4,12 +4,17 @@
 
 import net.bytebuddy.utility.RandomString;
 
+import org.javarosa.core.model.Constants;
 import org.javarosa.core.model.data.StringData;
 import org.odk.collect.android.formentry.questions.QuestionDetails;
 import org.junit.Test;
+import org.odk.collect.android.utilities.Appearances;
 import org.odk.collect.android.widgets.base.GeneralStringWidgetTest;
 
 import static junit.framework.TestCase.assertEquals;
+import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.hamcrest.CoreMatchers.is;
+import static org.hamcrest.CoreMatchers.not;
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
 import static org.mockito.Mockito.when;
@@ -28,6 +33,7 @@ public class StringNumberWidgetTest extends GeneralStringWidgetTest<StringNumber
     @NonNull
     @Override
     public StringNumberWidget createWidget() {
+        when(formEntryPrompt.getDataType()).thenReturn(Constants.DATATYPE_TEXT);
         return new StringNumberWidget(activity, new QuestionDetails(formEntryPrompt, readOnlyOverride));
     }
 
@@ -61,7 +67,6 @@ public void verifyInputType() {
         assertThat(widget.widgetAnswerText.getBinding().editText.getTransformationMethod().getClass(), equalTo(SingleLineTransformationMethod.class));
     }
 
-    @Override
     @Test
     public void verifyInputTypeWithMaskedAppearance() {
         when(formEntryPrompt.getAppearanceHint()).thenReturn(MASKED);
@@ -69,4 +74,18 @@ public void verifyInputTypeWithMaskedAppearance() {
         assertThat(widget.widgetAnswerText.getBinding().editText.getInputType(), equalTo(InputType.TYPE_CLASS_NUMBER));
         assertThat(widget.widgetAnswerText.getBinding().editText.getTransformationMethod().getClass(), equalTo(PasswordTransformationMethod.class));
     }
+
+    @Test
+    public void answersShouldNotBeMaskedIfMaskedAppearanceIsNotUsed() {
+        assertThat(getSpyWidget().widgetAnswerText.getBinding().editText.getTransformationMethod(), is(not(instanceOf(PasswordTransformationMethod.class))));
+        assertThat(getSpyWidget().widgetAnswerText.getBinding().textView.getTransformationMethod(), is(not(instanceOf(PasswordTransformationMethod.class))));
+    }
+
+    @Test
+    public void answersShouldBeMaskedIfMaskedAppearanceIsUsed() {
+        when(formEntryPrompt.getAppearanceHint()).thenReturn(Appearances.MASKED);
+
+        assertThat(getSpyWidget().widgetAnswerText.getBinding().editText.getTransformationMethod(), is(instanceOf(PasswordTransformationMethod.class)));
+        assertThat(getSpyWidget().widgetAnswerText.getBinding().textView.getTransformationMethod(), is(instanceOf(PasswordTransformationMethod.class)));
+    }
 }
diff --git a/collect_app/src/test/java/org/odk/collect/android/widgets/StringWidgetTest.java b/collect_app/src/test/java/org/odk/collect/android/widgets/StringWidgetTest.java
index c7e4b7988e0..bece4ed644b 100644
--- a/collect_app/src/test/java/org/odk/collect/android/widgets/StringWidgetTest.java
+++ b/collect_app/src/test/java/org/odk/collect/android/widgets/StringWidgetTest.java
@@ -2,6 +2,9 @@
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.equalTo;
+import static org.hamcrest.Matchers.instanceOf;
+import static org.hamcrest.Matchers.is;
+import static org.hamcrest.Matchers.not;
 import static org.mockito.Mockito.when;
 import static org.odk.collect.android.utilities.Appearances.MASKED;
 
@@ -13,9 +16,11 @@
 
 import net.bytebuddy.utility.RandomString;
 
+import org.javarosa.core.model.Constants;
 import org.javarosa.core.model.data.StringData;
 import org.junit.Test;
 import org.odk.collect.android.formentry.questions.QuestionDetails;
+import org.odk.collect.android.utilities.Appearances;
 import org.odk.collect.android.widgets.base.GeneralStringWidgetTest;
 
 /**
@@ -26,6 +31,7 @@ public class StringWidgetTest extends GeneralStringWidgetTest<StringWidget, Stri
     @NonNull
     @Override
     public StringWidget createWidget() {
+        when(formEntryPrompt.getDataType()).thenReturn(Constants.DATATYPE_TEXT);
         return new StringWidget(activity, new QuestionDetails(formEntryPrompt, readOnlyOverride));
     }
 
@@ -44,7 +50,6 @@ public void verifyInputType() {
         assertThat(widget.widgetAnswerText.getBinding().textView.getTransformationMethod(), equalTo(null));
     }
 
-    @Override
     @Test
     public void verifyInputTypeWithMaskedAppearance() {
         when(formEntryPrompt.getAppearanceHint()).thenReturn(MASKED);
@@ -52,4 +57,18 @@ public void verifyInputTypeWithMaskedAppearance() {
         assertThat(widget.widgetAnswerText.getBinding().editText.getInputType(), equalTo(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD));
         assertThat(widget.widgetAnswerText.getBinding().editText.getTransformationMethod().getClass(), equalTo(PasswordTransformationMethod.class));
     }
+
+    @Test
+    public void answersShouldNotBeMaskedIfMaskedAppearanceIsNotUsed() {
+        assertThat(getSpyWidget().widgetAnswerText.getBinding().editText.getTransformationMethod(), is(not(instanceOf(PasswordTransformationMethod.class))));
+        assertThat(getSpyWidget().widgetAnswerText.getBinding().textView.getTransformationMethod(), is(not(instanceOf(PasswordTransformationMethod.class))));
+    }
+
+    @Test
+    public void answersShouldBeMaskedIfMaskedAppearanceIsUsed() {
+        when(formEntryPrompt.getAppearanceHint()).thenReturn(Appearances.MASKED);
+
+        assertThat(getSpyWidget().widgetAnswerText.getBinding().editText.getTransformationMethod(), is(instanceOf(PasswordTransformationMethod.class)));
+        assertThat(getSpyWidget().widgetAnswerText.getBinding().textView.getTransformationMethod(), is(instanceOf(PasswordTransformationMethod.class)));
+    }
 }
diff --git a/collect_app/src/test/java/org/odk/collect/android/widgets/base/GeneralExStringWidgetTest.java b/collect_app/src/test/java/org/odk/collect/android/widgets/base/GeneralExStringWidgetTest.java
index 2e39352a067..c85f61eac27 100644
--- a/collect_app/src/test/java/org/odk/collect/android/widgets/base/GeneralExStringWidgetTest.java
+++ b/collect_app/src/test/java/org/odk/collect/android/widgets/base/GeneralExStringWidgetTest.java
@@ -2,20 +2,16 @@
 
 import static junit.framework.Assert.assertTrue;
 
-import android.text.method.PasswordTransformationMethod;
 import android.view.View;
 
 import org.javarosa.core.model.data.IAnswerData;
 import org.junit.Test;
 import org.odk.collect.android.R;
 import org.odk.collect.android.support.WidgetTestActivity;
-import org.odk.collect.android.utilities.Appearances;
 import org.odk.collect.android.widgets.ExStringWidget;
 
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.instanceOf;
 import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.not;
 import static org.mockito.Mockito.when;
 
 import java.util.List;
@@ -68,23 +64,6 @@ public void widgetShouldBeRegisteredForContextMenu() {
         assertThat(viewsRegisterForContextMenu.get(1).getId(), is(widget.getId()));
     }
 
-    @Test
-    public void answersShouldNotBeMaskedIfMaskedAppearanceIsNotUsed() {
-        assertThat(getSpyWidget().binding.widgetAnswerText.getBinding().editText.getTransformationMethod(), is(not(instanceOf(PasswordTransformationMethod.class))));
-        assertThat(getSpyWidget().binding.widgetAnswerText.getBinding().textView.getTransformationMethod(), is(not(instanceOf(PasswordTransformationMethod.class))));
-    }
-
-    @Test
-    public void answersShouldBeMaskedIfMaskedAppearanceIsUsed() {
-        when(formEntryPrompt.getAppearanceHint()).thenReturn(Appearances.MASKED);
-
-        assertThat(getSpyWidget().binding.widgetAnswerText.getBinding().editText.getTransformationMethod(), is(instanceOf(PasswordTransformationMethod.class)));
-        assertThat(getSpyWidget().binding.widgetAnswerText.getBinding().textView.getTransformationMethod(), is(instanceOf(PasswordTransformationMethod.class)));
-    }
-
     @Test
     public abstract void verifyInputType();
-
-    @Test
-    public abstract void verifyInputTypeWithMaskedAppearance();
 }
diff --git a/collect_app/src/test/java/org/odk/collect/android/widgets/base/GeneralStringWidgetTest.java b/collect_app/src/test/java/org/odk/collect/android/widgets/base/GeneralStringWidgetTest.java
index 536125a3f66..93408999016 100644
--- a/collect_app/src/test/java/org/odk/collect/android/widgets/base/GeneralStringWidgetTest.java
+++ b/collect_app/src/test/java/org/odk/collect/android/widgets/base/GeneralStringWidgetTest.java
@@ -2,7 +2,6 @@
 
 import static junit.framework.Assert.assertTrue;
 
-import android.text.method.PasswordTransformationMethod;
 import android.view.View;
 
 import org.javarosa.core.model.QuestionDef;
@@ -11,13 +10,10 @@
 import org.mockito.Mock;
 import org.odk.collect.android.R;
 import org.odk.collect.android.support.WidgetTestActivity;
-import org.odk.collect.android.utilities.Appearances;
 import org.odk.collect.android.widgets.StringWidget;
 
 import static org.hamcrest.MatcherAssert.assertThat;
-import static org.hamcrest.Matchers.instanceOf;
 import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.not;
 import static org.junit.Assert.assertEquals;
 import static org.mockito.Mockito.when;
 
@@ -107,23 +103,6 @@ public void widgetShouldBeRegisteredForContextMenu() {
         assertThat(viewsRegisterForContextMenu.get(1).getId(), is(widget.getId()));
     }
 
-    @Test
-    public void answersShouldNotBeMaskedIfMaskedAppearanceIsNotUsed() {
-        assertThat(getSpyWidget().widgetAnswerText.getBinding().editText.getTransformationMethod(), is(not(instanceOf(PasswordTransformationMethod.class))));
-        assertThat(getSpyWidget().widgetAnswerText.getBinding().textView.getTransformationMethod(), is(not(instanceOf(PasswordTransformationMethod.class))));
-    }
-
-    @Test
-    public void answersShouldBeMaskedIfMaskedAppearanceIsUsed() {
-        when(formEntryPrompt.getAppearanceHint()).thenReturn(Appearances.MASKED);
-
-        assertThat(getSpyWidget().widgetAnswerText.getBinding().editText.getTransformationMethod(), is(instanceOf(PasswordTransformationMethod.class)));
-        assertThat(getSpyWidget().widgetAnswerText.getBinding().textView.getTransformationMethod(), is(instanceOf(PasswordTransformationMethod.class)));
-    }
-
     @Test
     public abstract void verifyInputType();
-
-    @Test
-    public abstract void verifyInputTypeWithMaskedAppearance();
-}
\ No newline at end of file
+}