diff --git a/espresso/build.gradle b/espresso/build.gradle
index 95d6ac1..564235b 100644
--- a/espresso/build.gradle
+++ b/espresso/build.gradle
@@ -25,6 +25,7 @@ dependencies {
     implementation libs.material
     implementation libs.junit
     implementation libs.androidx.junit
+    implementation libs.androidx.espresso.device
     api(libs.androidx.uiautomator)
     api(libs.espresso.core)
     api(libs.espresso.contrib)
diff --git a/espresso/src/main/java/com/progressive/kherkin/espresso/steps/actions/ScreenOrientationSteps.kt b/espresso/src/main/java/com/progressive/kherkin/espresso/steps/actions/ScreenOrientationSteps.kt
new file mode 100644
index 0000000..b8d8ccc
--- /dev/null
+++ b/espresso/src/main/java/com/progressive/kherkin/espresso/steps/actions/ScreenOrientationSteps.kt
@@ -0,0 +1,21 @@
+package com.progressive.kherkin.espresso.steps.actions
+
+import androidx.test.espresso.device.DeviceInteraction.Companion.setScreenOrientation
+import androidx.test.espresso.device.EspressoDevice.Companion.onDevice
+import androidx.test.espresso.device.action.ScreenOrientation
+import com.progressive.kherkin.common.testcore.Gherkin
+
+/**
+ * Rotates the emulator or device to landscape orientation.
+ * Remember to rotate back to portrait, or use a rule to start tests in the desired orientation.
+ */
+fun Gherkin.IRotateToLandscape() {
+    onDevice().setScreenOrientation(ScreenOrientation.LANDSCAPE)
+}
+
+/**
+ * Rotates the emulator or device to portrait orientation.
+ */
+fun Gherkin.IRotateToPortrait() {
+    onDevice().setScreenOrientation(ScreenOrientation.PORTRAIT)
+}
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 98bed16..82a392b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -18,4 +18,5 @@ android.useAndroidX=true
 # Automatically convert third-party libraries to use AndroidX
 android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
-kotlin.code.style=official
\ No newline at end of file
+kotlin.code.style=official
+android.experimental.androidTest.enableEmulatorControl=true
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index ba4a784..0bd7b58 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -10,6 +10,7 @@ appcompat = "1.7.1"
 composeBom = "2025.06.01"
 constraintlayout = "2.2.1"
 espresso = "3.6.1"
+espressoDevice = "1.1.0"
 findbugs = "3.0.2"
 fragmentKtx = "1.8.8"
 javaxInject = "1"
@@ -25,6 +26,7 @@ viewbinding = "8.11.0"
 androidx-activity-compose = { module = "androidx.activity:activity-compose", version.ref = "activityCompose" }
 androidx-appcompat = { group = "androidx.appcompat", name = "appcompat", version.ref = "appcompat" }
 androidx-constraintlayout = { module = "androidx.constraintlayout:constraintlayout", version.ref = "constraintlayout" }
+androidx-espresso-device = { module = "androidx.test.espresso:espresso-device", version.ref = "espressoDevice" }
 androidx-fragment-ktx = { module = "androidx.fragment:fragment-ktx", version.ref = "fragmentKtx" }
 androidx-junit = { group = "androidx.test.ext", name = "junit", version.ref = "androidxJunit" }
 androidx-lifecycle-viewmodel-ktx = { module = "androidx.lifecycle:lifecycle-viewmodel-ktx", version.ref = "lifecycleViewmodelKtx" }
diff --git a/sampleapp/build.gradle b/sampleapp/build.gradle
index 178cde1..960e5d3 100644
--- a/sampleapp/build.gradle
+++ b/sampleapp/build.gradle
@@ -50,6 +50,9 @@ android {
                 }
             }
         }
+        emulatorControl {
+            enable = true
+        }
     }
 }
 
diff --git a/sampleapp/src/androidTest/java/com/progressive/sampleapp/tests/espresso/TestScreenOrientationSteps.kt b/sampleapp/src/androidTest/java/com/progressive/sampleapp/tests/espresso/TestScreenOrientationSteps.kt
new file mode 100644
index 0000000..784489e
--- /dev/null
+++ b/sampleapp/src/androidTest/java/com/progressive/sampleapp/tests/espresso/TestScreenOrientationSteps.kt
@@ -0,0 +1,36 @@
+package com.progressive.sampleapp.tests.espresso
+
+import com.progressive.kherkin.common.testcore.And
+import com.progressive.kherkin.common.testcore.Given
+import com.progressive.kherkin.common.testcore.Then
+import com.progressive.kherkin.common.testcore.When
+import com.progressive.kherkin.espresso.steps.actions.IRotateToLandscape
+import com.progressive.kherkin.espresso.steps.actions.IRotateToPortrait
+import com.progressive.kherkin.espresso.steps.assertion.IShouldNotSee
+import com.progressive.kherkin.espresso.steps.assertion.IShouldSee
+import com.progressive.kherkin.espresso.steps.setup.IRenderScreen
+import com.progressive.kherkin.sampleapp.R
+import com.progressive.sampleapp.screens.espresso.MainScreen
+import com.progressive.sampleapp.setup.SampleBaseIntegrationTestCase
+import org.junit.Test
+
+class TestScreenOrientationSteps : SampleBaseIntegrationTestCase() {
+
+    @Test
+    fun testRotateToLandscapeStep() {
+        Given.IRenderScreen(MainScreen())
+        When.IRotateToLandscape()
+        Then.IShouldSee(R.id.buttonNav)
+        And.IShouldNotSee(R.id.kherkin_logo)
+        And.IRotateToPortrait()
+    }
+
+    @Test
+    fun testRotateToPortraitStep() {
+        Given.IRenderScreen(MainScreen())
+        And.IRotateToLandscape()
+        And.IShouldNotSee(R.id.kherkin_logo)
+        When.IRotateToPortrait()
+        Then.IShouldSee(R.id.kherkin_logo)
+    }
+}
\ No newline at end of file
diff --git a/sampleapp/src/main/AndroidManifest.xml b/sampleapp/src/main/AndroidManifest.xml
index 78c6059..e1573e6 100644
--- a/sampleapp/src/main/AndroidManifest.xml
+++ b/sampleapp/src/main/AndroidManifest.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
+    <!--  Permissions needed to rotate emulator or device -->
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
diff --git a/sampleapp/src/main/res/layout/fragment_main.xml b/sampleapp/src/main/res/layout/fragment_main.xml
index ed8a7d4..b2df0ec 100644
--- a/sampleapp/src/main/res/layout/fragment_main.xml
+++ b/sampleapp/src/main/res/layout/fragment_main.xml
@@ -1,156 +1,162 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
-    android:id="@+id/constraint"
+    android:id="@+id/scrollView"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <TextView
-        android:id="@+id/textView"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/text_view_banner"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/constraint"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
 
-    <EditText
-        android:id="@+id/editText"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:autofillHints="no"
-        android:hint="@string/edit_text_hint"
-        android:inputType="text"
-        android:text=""
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/textView" />
+        <TextView
+            android:id="@+id/textView"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/text_view_banner"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
-    <ImageView
-        android:id="@+id/buttonClearEditText"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
-        android:contentDescription="@string/edit_text_clear_button"
-        android:src="@drawable/baseline_backspace_24"
-        android:tag="backspace"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.1"
-        app:layout_constraintStart_toEndOf="@+id/editText"
-        app:layout_constraintTop_toTopOf="@+id/editText" />
+        <EditText
+            android:id="@+id/editText"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:autofillHints="no"
+            android:hint="@string/edit_text_hint"
+            android:inputType="text"
+            android:text=""
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/textView" />
 
-    <Button
-        android:id="@+id/button"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:contentDescription="@string/button_text"
-        android:tag="clicky button"
-        android:text="@string/button_text"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/editText" />
+        <ImageView
+            android:id="@+id/buttonClearEditText"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="8dp"
+            android:contentDescription="@string/edit_text_clear_button"
+            android:src="@drawable/baseline_backspace_24"
+            android:tag="backspace"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintHorizontal_bias="0.1"
+            app:layout_constraintStart_toEndOf="@+id/editText"
+            app:layout_constraintTop_toTopOf="@+id/editText" />
 
-    <Spinner
-        android:id="@+id/spinner"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:entries="@array/options_array_short"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/button" />
+        <Button
+            android:id="@+id/button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:contentDescription="@string/button_text"
+            android:tag="clicky button"
+            android:text="@string/button_text"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/editText" />
 
-    <Button
-        android:id="@+id/buttonAlert"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:contentDescription="@string/alert_button_description"
-        android:onClick="showAlertDialog"
-        android:text="@string/alert_button"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/spinner" />
+        <Spinner
+            android:id="@+id/spinner"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:entries="@array/options_array_short"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/button" />
 
-    <EditText
-        android:id="@+id/textDatePicker"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:autofillHints="no"
-        android:clickable="false"
-        android:cursorVisible="false"
-        android:focusable="false"
-        android:focusableInTouchMode="false"
-        android:hint="@string/date_picker_hint"
-        android:inputType="date"
-        android:longClickable="false"
-        android:onClick="showDatePickerDialog"
-        android:text=""
-        app:layout_constraintEnd_toStartOf="@+id/textDateSpinner"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/buttonAlert" />
+        <Button
+            android:id="@+id/buttonAlert"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:contentDescription="@string/alert_button_description"
+            android:onClick="showAlertDialog"
+            android:text="@string/alert_button"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/spinner" />
 
-    <EditText
-        android:id="@+id/textDateSpinner"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:autofillHints="no"
-        android:clickable="false"
-        android:cursorVisible="false"
-        android:focusable="false"
-        android:focusableInTouchMode="false"
-        android:hint="@string/date_spinner_hint"
-        android:inputType="date"
-        android:longClickable="false"
-        android:onClick="showDateSpinnerDialog"
-        android:text=""
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/buttonAlert" />
+        <EditText
+            android:id="@+id/textDatePicker"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:autofillHints="no"
+            android:clickable="false"
+            android:cursorVisible="false"
+            android:focusable="false"
+            android:focusableInTouchMode="false"
+            android:hint="@string/date_picker_hint"
+            android:inputType="date"
+            android:longClickable="false"
+            android:onClick="showDatePickerDialog"
+            android:text=""
+            app:layout_constraintEnd_toStartOf="@+id/textDateSpinner"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/buttonAlert" />
 
-    <EditText
-        android:id="@+id/textTimePicker"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:autofillHints="no"
-        android:clickable="false"
-        android:cursorVisible="false"
-        android:focusable="false"
-        android:focusableInTouchMode="false"
-        android:hint="@string/time_picker_hint"
-        android:inputType="date"
-        android:longClickable="false"
-        android:onClick="showTimePickerDialog"
-        android:text=""
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@+id/textDateSpinner"
-        app:layout_constraintTop_toBottomOf="@+id/buttonAlert" />
+        <EditText
+            android:id="@+id/textDateSpinner"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:autofillHints="no"
+            android:clickable="false"
+            android:cursorVisible="false"
+            android:focusable="false"
+            android:focusableInTouchMode="false"
+            android:hint="@string/date_spinner_hint"
+            android:inputType="date"
+            android:longClickable="false"
+            android:onClick="showDateSpinnerDialog"
+            android:text=""
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/buttonAlert" />
 
-    <Button
-        android:id="@+id/buttonNav"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/button_navigate"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/textTimePicker" />
+        <EditText
+            android:id="@+id/textTimePicker"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:autofillHints="no"
+            android:clickable="false"
+            android:cursorVisible="false"
+            android:focusable="false"
+            android:focusableInTouchMode="false"
+            android:hint="@string/time_picker_hint"
+            android:inputType="date"
+            android:longClickable="false"
+            android:onClick="showTimePickerDialog"
+            android:text=""
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toEndOf="@+id/textDateSpinner"
+            app:layout_constraintTop_toBottomOf="@+id/buttonAlert" />
 
-    <Button
-        android:id="@+id/buttonNavCompose"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:text="@string/navigate_to_compose_button"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/buttonNav" />
+        <Button
+            android:id="@+id/buttonNav"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/button_navigate"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/textTimePicker" />
 
-    <ImageView
-        android:id="@+id/kherkin_logo"
-        android:layout_width="320dp"
-        android:layout_height="320dp"
-        android:contentDescription="@string/kherkin_logo_content_description"
-        android:src="@drawable/kherkin_logo"
-        android:layout_marginTop="32dp"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/buttonNavCompose"/>
+        <Button
+            android:id="@+id/buttonNavCompose"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/navigate_to_compose_button"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/buttonNav" />
 
-</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
+        <ImageView
+            android:id="@+id/kherkin_logo"
+            android:layout_width="320dp"
+            android:layout_height="320dp"
+            android:layout_marginTop="32dp"
+            android:contentDescription="@string/kherkin_logo_content_description"
+            android:src="@drawable/kherkin_logo"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@+id/buttonNavCompose" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</ScrollView>
\ No newline at end of file