diff --git a/vector/src/test/java/im/vector/app/features/poll/create/CreatePollViewModelTest.kt b/vector/src/test/java/im/vector/app/features/poll/create/CreatePollViewModelTest.kt
index e0364b286f..373fd77d40 100644
--- a/vector/src/test/java/im/vector/app/features/poll/create/CreatePollViewModelTest.kt
+++ b/vector/src/test/java/im/vector/app/features/poll/create/CreatePollViewModelTest.kt
@@ -18,20 +18,20 @@ package im.vector.app.features.poll.create
 
 import com.airbnb.mvrx.test.MvRxTestRule
 import im.vector.app.features.poll.PollMode
-import im.vector.app.features.poll.create.FakeCreatePollViewStates.A_FAKE_OPTIONS
-import im.vector.app.features.poll.create.FakeCreatePollViewStates.A_FAKE_QUESTION
-import im.vector.app.features.poll.create.FakeCreatePollViewStates.A_FAKE_ROOM_ID
-import im.vector.app.features.poll.create.FakeCreatePollViewStates.A_POLL_START_TIMELINE_EVENT
-import im.vector.app.features.poll.create.FakeCreatePollViewStates.createPollArgs
-import im.vector.app.features.poll.create.FakeCreatePollViewStates.editPollArgs
-import im.vector.app.features.poll.create.FakeCreatePollViewStates.editedPollViewState
-import im.vector.app.features.poll.create.FakeCreatePollViewStates.initialCreatePollViewState
-import im.vector.app.features.poll.create.FakeCreatePollViewStates.pollViewStateWithOnlyQuestion
-import im.vector.app.features.poll.create.FakeCreatePollViewStates.pollViewStateWithQuestionAndEnoughOptions
-import im.vector.app.features.poll.create.FakeCreatePollViewStates.pollViewStateWithQuestionAndEnoughOptionsButDeletedLastOption
-import im.vector.app.features.poll.create.FakeCreatePollViewStates.pollViewStateWithQuestionAndMaxOptions
-import im.vector.app.features.poll.create.FakeCreatePollViewStates.pollViewStateWithQuestionAndNotEnoughOptions
-import im.vector.app.features.poll.create.FakeCreatePollViewStates.pollViewStateWithoutQuestionAndEnoughOptions
+import im.vector.app.test.fakes.FakeCreatePollViewStates.A_FAKE_OPTIONS
+import im.vector.app.test.fakes.FakeCreatePollViewStates.A_FAKE_QUESTION
+import im.vector.app.test.fakes.FakeCreatePollViewStates.A_FAKE_ROOM_ID
+import im.vector.app.test.fakes.FakeCreatePollViewStates.A_POLL_START_TIMELINE_EVENT
+import im.vector.app.test.fakes.FakeCreatePollViewStates.createPollArgs
+import im.vector.app.test.fakes.FakeCreatePollViewStates.editPollArgs
+import im.vector.app.test.fakes.FakeCreatePollViewStates.editedPollViewState
+import im.vector.app.test.fakes.FakeCreatePollViewStates.initialCreatePollViewState
+import im.vector.app.test.fakes.FakeCreatePollViewStates.pollViewStateWithOnlyQuestion
+import im.vector.app.test.fakes.FakeCreatePollViewStates.pollViewStateWithQuestionAndEnoughOptions
+import im.vector.app.test.fakes.FakeCreatePollViewStates.pollViewStateWithQuestionAndEnoughOptionsButDeletedLastOption
+import im.vector.app.test.fakes.FakeCreatePollViewStates.pollViewStateWithQuestionAndMaxOptions
+import im.vector.app.test.fakes.FakeCreatePollViewStates.pollViewStateWithQuestionAndNotEnoughOptions
+import im.vector.app.test.fakes.FakeCreatePollViewStates.pollViewStateWithoutQuestionAndEnoughOptions
 import im.vector.app.test.fakes.FakeSession
 import im.vector.app.test.test
 import io.mockk.unmockkAll
diff --git a/vector/src/test/java/im/vector/app/features/poll/create/FakeCreatePollViewStates.kt b/vector/src/test/java/im/vector/app/test/fakes/FakeCreatePollViewStates.kt
similarity index 96%
rename from vector/src/test/java/im/vector/app/features/poll/create/FakeCreatePollViewStates.kt
rename to vector/src/test/java/im/vector/app/test/fakes/FakeCreatePollViewStates.kt
index e5eeb86b04..04f3526602 100644
--- a/vector/src/test/java/im/vector/app/features/poll/create/FakeCreatePollViewStates.kt
+++ b/vector/src/test/java/im/vector/app/test/fakes/FakeCreatePollViewStates.kt
@@ -14,9 +14,12 @@
  * limitations under the License.
  */
 
-package im.vector.app.features.poll.create
+package im.vector.app.test.fakes
 
 import im.vector.app.features.poll.PollMode
+import im.vector.app.features.poll.create.CreatePollArgs
+import im.vector.app.features.poll.create.CreatePollViewModel
+import im.vector.app.features.poll.create.CreatePollViewState
 import org.matrix.android.sdk.api.session.events.model.Event
 import org.matrix.android.sdk.api.session.events.model.EventType
 import org.matrix.android.sdk.api.session.events.model.toContent