diff --git a/plugins/android-extensions/android-extensions-compiler/test/org/jetbrains/kotlin/android/parcel/ParcelBoxTestGenerated.java b/plugins/android-extensions/android-extensions-compiler/test/org/jetbrains/kotlin/android/parcel/ParcelBoxTestGenerated.java
index 497aed55a3b..b0999d32106 100644
--- a/plugins/android-extensions/android-extensions-compiler/test/org/jetbrains/kotlin/android/parcel/ParcelBoxTestGenerated.java
+++ b/plugins/android-extensions/android-extensions-compiler/test/org/jetbrains/kotlin/android/parcel/ParcelBoxTestGenerated.java
@@ -29,6 +29,11 @@ public class ParcelBoxTestGenerated extends AbstractParcelBoxTest {
         KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("plugins/android-extensions/android-extensions-compiler/testData/parcel/box"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM, true);
     }
 
+    @TestMetadata("allPrimitiveTypes.kt")
+    public void testAllPrimitiveTypes() throws Exception {
+        runTest("plugins/android-extensions/android-extensions-compiler/testData/parcel/box/allPrimitiveTypes.kt");
+    }
+
     @TestMetadata("arraySimple.kt")
     public void testArraySimple() throws Exception {
         runTest("plugins/android-extensions/android-extensions-compiler/testData/parcel/box/arraySimple.kt");
diff --git a/plugins/android-extensions/android-extensions-compiler/test/org/jetbrains/kotlin/android/parcel/ParcelIrBoxTestGenerated.java b/plugins/android-extensions/android-extensions-compiler/test/org/jetbrains/kotlin/android/parcel/ParcelIrBoxTestGenerated.java
index 0560dbab406..64a6aad0a2c 100644
--- a/plugins/android-extensions/android-extensions-compiler/test/org/jetbrains/kotlin/android/parcel/ParcelIrBoxTestGenerated.java
+++ b/plugins/android-extensions/android-extensions-compiler/test/org/jetbrains/kotlin/android/parcel/ParcelIrBoxTestGenerated.java
@@ -29,6 +29,11 @@ public class ParcelIrBoxTestGenerated extends AbstractParcelIrBoxTest {
         KotlinTestUtils.assertAllTestsPresentByMetadataWithExcluded(this.getClass(), new File("plugins/android-extensions/android-extensions-compiler/testData/parcel/box"), Pattern.compile("^(.+)\\.kt$"), null, TargetBackend.JVM_IR, true);
     }
 
+    @TestMetadata("allPrimitiveTypes.kt")
+    public void testAllPrimitiveTypes() throws Exception {
+        runTest("plugins/android-extensions/android-extensions-compiler/testData/parcel/box/allPrimitiveTypes.kt");
+    }
+
     @TestMetadata("arraySimple.kt")
     public void testArraySimple() throws Exception {
         runTest("plugins/android-extensions/android-extensions-compiler/testData/parcel/box/arraySimple.kt");
diff --git a/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/allPrimitiveTypes.kt b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/allPrimitiveTypes.kt
new file mode 100644
index 00000000000..467496e857c
--- /dev/null
+++ b/plugins/android-extensions/android-extensions-compiler/testData/parcel/box/allPrimitiveTypes.kt
@@ -0,0 +1,60 @@
+// WITH_RUNTIME
+
+@file:JvmName("TestKt")
+package test
+
+import kotlinx.android.parcel.*
+import android.os.Parcel
+import android.os.Parcelable
+
+@Parcelize
+data class PrimitiveTypes(
+    val boo: Boolean, val c: Char, val byt: Byte, val s: Short,
+    val i: Int, val f: Float, val l: Long, val d: Double,
+
+    val nboo: Boolean?, val nc: Char?, val nbyt: Byte?, val ns: Short?,
+    val ni: Int?, val nf: Float?, val nl: Long?, val nd: Double?,
+
+    val jboo: java.lang.Boolean, val jc: java.lang.Character, val jbyt: java.lang.Byte, val js: java.lang.Short,
+    val ji: java.lang.Integer, val jf: java.lang.Float, val jl: java.lang.Long, val jd: java.lang.Double,
+
+    val njboo: java.lang.Boolean?, val njc: java.lang.Character?, val njbyt: java.lang.Byte?, val njs: java.lang.Short?,
+    val nji: java.lang.Integer?, val njf: java.lang.Float?, val njl: java.lang.Long?, val njd: java.lang.Double?
+) : Parcelable
+
+fun box() = parcelTest { parcel ->
+    val first = PrimitiveTypes(
+        true, '#', 3.toByte(), 10.toShort(), -300, -5.0f, Long.MAX_VALUE, 3.14,
+        true, '#', 3.toByte(), 10.toShort(), -300, -5.0f, Long.MAX_VALUE, 3.14,
+        true as java.lang.Boolean, '#' as java.lang.Character,
+        3.toByte() as java.lang.Byte, 10.toShort() as java.lang.Short,
+        -300 as java.lang.Integer, -5.0f as java.lang.Float,
+        10L as java.lang.Long, 3.14 as java.lang.Double,
+        true as java.lang.Boolean, '#' as java.lang.Character,
+        3.toByte() as java.lang.Byte, 10.toShort() as java.lang.Short,
+        -300 as java.lang.Integer, -5.0f as java.lang.Float,
+        10L as java.lang.Long, 3.14 as java.lang.Double
+    )
+    val second = PrimitiveTypes(
+        false, '\n', Byte.MIN_VALUE, Short.MIN_VALUE,
+        Int.MIN_VALUE, Float.POSITIVE_INFINITY, Long.MAX_VALUE, Double.NEGATIVE_INFINITY,
+        null, null, null, null, null, null, null, null,
+        false as java.lang.Boolean, '\n' as java.lang.Character,
+        Byte.MIN_VALUE as java.lang.Byte, Short.MIN_VALUE as java.lang.Short,
+        Int.MIN_VALUE as java.lang.Integer, Float.POSITIVE_INFINITY as java.lang.Float,
+        java.lang.Long(Long.MAX_VALUE), java.lang.Double(Double.NEGATIVE_INFINITY),
+        null, null, null, null, null, null, null, null
+    )
+
+    first.writeToParcel(parcel, 0)
+    second.writeToParcel(parcel, 0)
+
+    val bytes = parcel.marshall()
+    parcel.unmarshall(bytes, 0, bytes.size)
+
+    val first2 = readFromParcel<PrimitiveTypes>(parcel)
+    val second2 = readFromParcel<PrimitiveTypes>(parcel)
+
+    assert(first == first2)
+    assert(second == second2)
+}
\ No newline at end of file