diff --git a/features/fixtures/mazerunner/app/build.gradle b/features/fixtures/mazerunner/app/build.gradle
index 6efd873531..9ff091d770 100644
--- a/features/fixtures/mazerunner/app/build.gradle
+++ b/features/fixtures/mazerunner/app/build.gradle
@@ -10,7 +10,7 @@ android {
     defaultConfig {
         minSdkVersion 17
         targetSdkVersion 35
-        versionCode 35
+        versionCode 1
         versionName "1.1.14"
         manifestPlaceholders = [
                 // omit any of the following placeholders to use the default values
diff --git a/features/full_tests/internal_error_reports.feature b/features/full_tests/internal_error_reports.feature
index 7715a31b23..f53b999142 100644
--- a/features/full_tests/internal_error_reports.feature
+++ b/features/full_tests/internal_error_reports.feature
@@ -40,7 +40,7 @@ Feature: Cached Error Reports
     And the event "app.releaseStage" equals "mazerunner"
     And the event "app.type" equals "android"
     And the event "app.version" equals "1.1.14"
-    And the event "app.versionCode" equals 35
+    And the event "app.versionCode" equals 1
     And the error payload field "events.0.app.duration" is an integer
     And the error payload field "events.0.app.durationInForeground" is an integer
     And the event "app.inForeground" is true
diff --git a/features/full_tests/load_configuration.feature b/features/full_tests/load_configuration.feature
index 675d399eb4..e6e820bf21 100644
--- a/features/full_tests/load_configuration.feature
+++ b/features/full_tests/load_configuration.feature
@@ -43,7 +43,7 @@ Feature: Loading values into the configuration
     And the event "app.releaseStage" is not null
     And the event "metaData.test.foo" equals "bar"
     And the event "metaData.test.filter_me" equals "foobar"
-    And the event "app.versionCode" equals 35
+    And the event "app.versionCode" equals 1
     And the event "app.buildUUID" is not null
     And the event "app.version" equals "1.1.14"
     And the event "app.type" is null
diff --git a/features/smoke_tests/01_anr.feature b/features/smoke_tests/01_anr.feature
index 59b057a776..0bc200017c 100644
--- a/features/smoke_tests/01_anr.feature
+++ b/features/smoke_tests/01_anr.feature
@@ -40,7 +40,7 @@ Feature: ANR smoke test
     And the event "app.releaseStage" equals "mazerunner"
     And the event "app.type" equals "android"
     And the event "app.version" equals "1.1.14"
-    And the event "app.versionCode" equals 35
+    And the event "app.versionCode" equals 1
     And the error payload field "events.0.app.duration" is an integer
     And the error payload field "events.0.app.durationInForeground" is an integer
     And the event "app.inForeground" is true
diff --git a/features/smoke_tests/02_handled.feature b/features/smoke_tests/02_handled.feature
index 5b62521509..9d8943b73e 100644
--- a/features/smoke_tests/02_handled.feature
+++ b/features/smoke_tests/02_handled.feature
@@ -40,7 +40,7 @@ Feature: Handled smoke tests
     And the event "app.releaseStage" equals "mazerunner"
     And the event "app.type" equals "android"
     And the event "app.version" equals "1.1.14"
-    And the event "app.versionCode" equals 35
+    And the event "app.versionCode" equals 1
     And the error payload field "events.0.app.duration" is an integer
     And the error payload field "events.0.app.durationInForeground" is an integer
     And the event "app.inForeground" is true
@@ -196,7 +196,7 @@ Feature: Handled smoke tests
     And the event "app.releaseStage" equals "mazerunner"
     And the event "app.type" equals "android"
     And the event "app.version" equals "1.1.14"
-    And the event "app.versionCode" equals 35
+    And the event "app.versionCode" equals 1
     And the error payload field "events.0.app.duration" is an integer
     And the error payload field "events.0.app.durationInForeground" is an integer
     And the event "app.inForeground" is true
diff --git a/features/smoke_tests/03_sessions.feature b/features/smoke_tests/03_sessions.feature
index 937ae1103f..4ba4b84d76 100644
--- a/features/smoke_tests/03_sessions.feature
+++ b/features/smoke_tests/03_sessions.feature
@@ -24,7 +24,7 @@ Feature: Session functionality smoke tests
     And the session payload field "app.releaseStage" equals "mazerunner"
     And the session payload field "app.type" equals "android"
     And the session payload field "app.version" equals "1.1.14"
-    And the session payload field "app.versionCode" equals 35
+    And the session payload field "app.versionCode" equals 1
 
     # Device data
     And the session payload field "device.cpuAbi" is a non-empty array
diff --git a/features/smoke_tests/04_unhandled.feature b/features/smoke_tests/04_unhandled.feature
index 17da27cafa..5c1beb7b92 100644
--- a/features/smoke_tests/04_unhandled.feature
+++ b/features/smoke_tests/04_unhandled.feature
@@ -41,7 +41,7 @@ Feature: Unhandled smoke tests
     And the event "app.releaseStage" equals "mazerunner"
     And the event "app.type" equals "android"
     And the event "app.version" equals "1.1.14"
-    And the event "app.versionCode" equals 35
+    And the event "app.versionCode" equals 1
     And the error payload field "events.0.app.duration" is an integer
     And the error payload field "events.0.app.durationInForeground" is an integer
     And the event "app.inForeground" is true
diff --git a/features/steps/android_steps.rb b/features/steps/android_steps.rb
index 30c06947a1..d07d355dd1 100644
--- a/features/steps/android_steps.rb
+++ b/features/steps/android_steps.rb
@@ -174,7 +174,7 @@ def wait_for_app_state(expected_state)
     And the error payload field "events.0.app.releaseStage" is not null
     And the error payload field "events.0.app.type" equals "android"
     And the error payload field "events.0.app.version" is not null
-    And the error payload field "events.0.app.versionCode" equals 35
+    And the error payload field "events.0.app.versionCode" equals 1
     And the error payload field "events.0.device.id" is not null
     And the error payload field "events.0.device.locale" is not null
     And the error payload field "events.0.device.manufacturer" is not null