diff --git a/android/src/androidTest/java/net/twisterrob/inventory/android/activity/EditActivityTest_Create.java b/android/src/androidTest/java/net/twisterrob/inventory/android/activity/EditActivityTest_Create.java
index a9960003..bad9d650 100644
--- a/android/src/androidTest/java/net/twisterrob/inventory/android/activity/EditActivityTest_Create.java
+++ b/android/src/androidTest/java/net/twisterrob/inventory/android/activity/EditActivityTest_Create.java
@@ -9,6 +9,7 @@
 
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.*;
+import static org.hamcrest.junit.MatcherAssume.assumeThat;
 
 import android.app.Activity;
 
@@ -181,6 +182,14 @@ public void lastOperationFinishesActivity() {
 	}
 
 	@Test public void testChangeCategoryAndKeywordsDialog() {
+		assumeThat(
+				"Only items have change type button for now.",
+				this,
+				not(anyOf(
+						instanceOf(PropertyEditActivityTest_Create.class),
+						instanceOf(RoomEditActivityTest_Create.class)
+				))
+		);
 		ChangeTypeDialogActor dialog = editor.changeType();
 
 		KeywordsDialogActor keywords = dialog.showKeywords(belonging.getOtherType());