diff --git a/spring-statemachine-build-tests/src/test/java/org/springframework/statemachine/buildtests/tck/AbstractTckTests.java b/spring-statemachine-build-tests/src/test/java/org/springframework/statemachine/buildtests/tck/AbstractTckTests.java
index 34998096..95258b51 100644
--- a/spring-statemachine-build-tests/src/test/java/org/springframework/statemachine/buildtests/tck/AbstractTckTests.java
+++ b/spring-statemachine-build-tests/src/test/java/org/springframework/statemachine/buildtests/tck/AbstractTckTests.java
@@ -86,4 +86,25 @@ public abstract class AbstractTckTests {
 	 * @return StateMachine for SimpleMachine
 	 */
 	protected abstract StateMachine<String, String> getSimpleMachine() throws Exception;
+
+	@Test
+	public void testSimpleSubMachine() throws Exception {
+		StateMachine<String,String> stateMachine = getSimpleSubMachine();
+		StateMachineTestPlan<String, String> plan =
+				StateMachineTestPlanBuilder.<String, String>builder()
+					.stateMachine(stateMachine)
+					.step().expectStates("S1").and()
+					.step().sendEvent("E1").expectStates("S2", "S21").and()
+					.step().sendEvent("E2").expectStates("S2", "S22").and()
+					.step().sendEvent("E3").expectStates("S3").and()
+					.build();
+		plan.test();
+	}
+
+	/**
+	 * Return state machine for {@link #testSimpleSubMachine()}.
+	 *
+	 * @return StateMachine for SimpleSubMachine
+	 */
+	protected abstract StateMachine<String, String> getSimpleSubMachine() throws Exception;
 }
diff --git a/spring-statemachine-build-tests/src/test/java/org/springframework/statemachine/buildtests/tck/javaconfig/AnnotationFactoryTckTests.java b/spring-statemachine-build-tests/src/test/java/org/springframework/statemachine/buildtests/tck/javaconfig/AnnotationFactoryTckTests.java
index 965d028a..9eea6db1 100644
--- a/spring-statemachine-build-tests/src/test/java/org/springframework/statemachine/buildtests/tck/javaconfig/AnnotationFactoryTckTests.java
+++ b/spring-statemachine-build-tests/src/test/java/org/springframework/statemachine/buildtests/tck/javaconfig/AnnotationFactoryTckTests.java
@@ -44,6 +44,13 @@ public class AnnotationFactoryTckTests extends AbstractTckTests {
 		return getStateMachineFactoryFromContext().getStateMachine();
 	}
 
+	@Override
+	protected StateMachine<String, String> getSimpleSubMachine() throws Exception {
+		context.register(SimpleSubMachineConfig.class);
+		context.refresh();
+		return getStateMachineFactoryFromContext().getStateMachine();
+	}
+
 	@Configuration
 	@EnableStateMachineFactory
 	static class SimpleMachineConfig extends StateMachineConfigurerAdapter<String, String> {
@@ -69,4 +76,39 @@ public class AnnotationFactoryTckTests extends AbstractTckTests {
 					.event("E2");
 		}
 	}
+
+	@Configuration
+	@EnableStateMachineFactory
+	static class SimpleSubMachineConfig extends StateMachineConfigurerAdapter<String, String> {
+
+		@Override
+		public void configure(StateMachineStateConfigurer<String, String> states) throws Exception {
+			states
+				.withStates()
+					.initial("S1")
+					.state("S2")
+					.state("S3")
+					.and()
+					.withStates()
+						.parent("S2")
+						.initial("S21")
+						.state("S22");
+		}
+
+		@Override
+		public void configure(StateMachineTransitionConfigurer<String, String> transitions) throws Exception {
+			transitions
+				.withExternal()
+					.source("S1").target("S2")
+					.event("E1")
+					.and()
+				.withExternal()
+					.source("S21").target("S22")
+					.event("E2")
+					.and()
+				.withExternal()
+					.source("S2").target("S3")
+					.event("E3");
+		}
+	}
 }
diff --git a/spring-statemachine-build-tests/src/test/java/org/springframework/statemachine/buildtests/tck/javaconfig/AnnotationTckTests.java b/spring-statemachine-build-tests/src/test/java/org/springframework/statemachine/buildtests/tck/javaconfig/AnnotationTckTests.java
index 74bb4c4d..302948ed 100644
--- a/spring-statemachine-build-tests/src/test/java/org/springframework/statemachine/buildtests/tck/javaconfig/AnnotationTckTests.java
+++ b/spring-statemachine-build-tests/src/test/java/org/springframework/statemachine/buildtests/tck/javaconfig/AnnotationTckTests.java
@@ -44,6 +44,13 @@ public class AnnotationTckTests extends AbstractTckTests {
 		return getStateMachineFromContext();
 	}
 
+	@Override
+	protected StateMachine<String, String> getSimpleSubMachine() throws Exception {
+		context.register(SimpleSubMachineConfig.class);
+		context.refresh();
+		return getStateMachineFromContext();
+	}
+
 	@Configuration
 	@EnableStateMachine
 	static class SimpleMachineConfig extends StateMachineConfigurerAdapter<String, String> {
@@ -69,4 +76,39 @@ public class AnnotationTckTests extends AbstractTckTests {
 					.event("E2");
 		}
 	}
+
+	@Configuration
+	@EnableStateMachine
+	static class SimpleSubMachineConfig extends StateMachineConfigurerAdapter<String, String> {
+
+		@Override
+		public void configure(StateMachineStateConfigurer<String, String> states) throws Exception {
+			states
+				.withStates()
+					.initial("S1")
+					.state("S2")
+					.state("S3")
+					.and()
+					.withStates()
+						.parent("S2")
+						.initial("S21")
+						.state("S22");
+		}
+
+		@Override
+		public void configure(StateMachineTransitionConfigurer<String, String> transitions) throws Exception {
+			transitions
+				.withExternal()
+					.source("S1").target("S2")
+					.event("E1")
+					.and()
+				.withExternal()
+					.source("S21").target("S22")
+					.event("E2")
+					.and()
+				.withExternal()
+					.source("S2").target("S3")
+					.event("E3");
+		}
+	}
 }
diff --git a/spring-statemachine-build-tests/src/test/java/org/springframework/statemachine/buildtests/tck/javaconfig/BuilderTckTests.java b/spring-statemachine-build-tests/src/test/java/org/springframework/statemachine/buildtests/tck/javaconfig/BuilderTckTests.java
index 5f4b93b5..e01c9084 100644
--- a/spring-statemachine-build-tests/src/test/java/org/springframework/statemachine/buildtests/tck/javaconfig/BuilderTckTests.java
+++ b/spring-statemachine-build-tests/src/test/java/org/springframework/statemachine/buildtests/tck/javaconfig/BuilderTckTests.java
@@ -46,4 +46,32 @@ public class BuilderTckTests extends AbstractTckTests {
 				.event("E2");
 		return builder.build();
 	}
+
+	@Override
+	protected StateMachine<String, String> getSimpleSubMachine() throws Exception {
+		Builder<String, String> builder = StateMachineBuilder.builder();
+		builder.configureStates()
+			.withStates()
+				.initial("S1")
+				.state("S2")
+				.state("S3")
+				.and()
+				.withStates()
+					.parent("S2")
+					.initial("S21")
+					.state("S22");
+		builder.configureTransitions()
+			.withExternal()
+				.source("S1").target("S2")
+				.event("E1")
+				.and()
+			.withExternal()
+				.source("S21").target("S22")
+				.event("E2")
+				.and()
+			.withExternal()
+				.source("S2").target("S3")
+				.event("E3");
+		return builder.build();
+	}
 }
diff --git a/spring-statemachine-build-tests/src/test/java/org/springframework/statemachine/buildtests/tck/jpa/JpaJsonTckTests.java b/spring-statemachine-build-tests/src/test/java/org/springframework/statemachine/buildtests/tck/jpa/JpaJsonTckTests.java
index 16995734..e91f88d6 100644
--- a/spring-statemachine-build-tests/src/test/java/org/springframework/statemachine/buildtests/tck/jpa/JpaJsonTckTests.java
+++ b/spring-statemachine-build-tests/src/test/java/org/springframework/statemachine/buildtests/tck/jpa/JpaJsonTckTests.java
@@ -57,6 +57,13 @@ public class JpaJsonTckTests extends AbstractTckTests {
 		return getStateMachineFactoryFromContext().getStateMachine();
 	}
 
+	@Override
+	protected StateMachine<String, String> getSimpleSubMachine() throws Exception {
+		context.register(TestConfig.class, SimpleSubMachineConfig.class, StateMachineFactoryConfig.class);
+		context.refresh();
+		return getStateMachineFactoryFromContext().getStateMachine();
+	}
+
 	@Configuration
 	public static class SimpleMachineConfig {
 
@@ -68,6 +75,17 @@ public class JpaJsonTckTests extends AbstractTckTests {
 		}
 	}
 
+	@Configuration
+	public static class SimpleSubMachineConfig {
+
+		@Bean
+		public StateMachineJackson2RepositoryPopulatorFactoryBean jackson2RepositoryPopulatorFactoryBean() {
+			StateMachineJackson2RepositoryPopulatorFactoryBean factoryBean = new StateMachineJackson2RepositoryPopulatorFactoryBean();
+			factoryBean.setResources(new Resource[]{new ClassPathResource("org/springframework/statemachine/buildtests/tck/jpa/SimpleSubMachine.json")});
+			return factoryBean;
+		}
+	}
+
 	@Configuration
 	@EnableStateMachineFactory
 	public static class StateMachineFactoryConfig extends StateMachineConfigurerAdapter<String, String> {
diff --git a/spring-statemachine-build-tests/src/test/java/org/springframework/statemachine/buildtests/tck/jpa/JpaManualTckTests.java b/spring-statemachine-build-tests/src/test/java/org/springframework/statemachine/buildtests/tck/jpa/JpaManualTckTests.java
index 785f4728..871471e3 100644
--- a/spring-statemachine-build-tests/src/test/java/org/springframework/statemachine/buildtests/tck/jpa/JpaManualTckTests.java
+++ b/spring-statemachine-build-tests/src/test/java/org/springframework/statemachine/buildtests/tck/jpa/JpaManualTckTests.java
@@ -76,6 +76,40 @@ public class JpaManualTckTests extends AbstractTckTests {
 		return getStateMachineFactoryFromContext().getStateMachine();
 	}
 
+	@Override
+	protected StateMachine<String, String> getSimpleSubMachine() throws Exception {
+		context.register(TestConfig.class, StateMachineFactoryConfig.class);
+		context.refresh();
+
+		JpaStateRepository stateRepository = context.getBean(JpaStateRepository.class);
+		JpaTransitionRepository transitionRepository = context.getBean(JpaTransitionRepository.class);
+
+		JpaRepositoryState stateS1 = new JpaRepositoryState("S1", true);
+		JpaRepositoryState stateS2 = new JpaRepositoryState("S2");
+		JpaRepositoryState stateS3 = new JpaRepositoryState("S3");
+
+		JpaRepositoryState stateS21 = new JpaRepositoryState("S21", true);
+		stateS21.setParentState(stateS2);
+		JpaRepositoryState stateS22 = new JpaRepositoryState("S22");
+		stateS22.setParentState(stateS2);
+
+		stateRepository.save(stateS1);
+		stateRepository.save(stateS2);
+		stateRepository.save(stateS3);
+		stateRepository.save(stateS21);
+		stateRepository.save(stateS22);
+
+		JpaRepositoryTransition transitionS1ToS2 = new JpaRepositoryTransition(stateS1, stateS2, "E1");
+		JpaRepositoryTransition transitionS2ToS3 = new JpaRepositoryTransition(stateS21, stateS22, "E2");
+		JpaRepositoryTransition transitionS21ToS22 = new JpaRepositoryTransition(stateS2, stateS3, "E3");
+
+		transitionRepository.save(transitionS1ToS2);
+		transitionRepository.save(transitionS2ToS3);
+		transitionRepository.save(transitionS21ToS22);
+
+		return getStateMachineFactoryFromContext().getStateMachine();
+	}
+
 	@Configuration
 	@EnableStateMachineFactory
 	public static class StateMachineFactoryConfig extends StateMachineConfigurerAdapter<String, String> {
diff --git a/spring-statemachine-build-tests/src/test/java/org/springframework/statemachine/buildtests/tck/mongodb/MongoDbJsonTckTests.java b/spring-statemachine-build-tests/src/test/java/org/springframework/statemachine/buildtests/tck/mongodb/MongoDbJsonTckTests.java
index 0257d0ce..bee7c44d 100644
--- a/spring-statemachine-build-tests/src/test/java/org/springframework/statemachine/buildtests/tck/mongodb/MongoDbJsonTckTests.java
+++ b/spring-statemachine-build-tests/src/test/java/org/springframework/statemachine/buildtests/tck/mongodb/MongoDbJsonTckTests.java
@@ -79,6 +79,13 @@ public class MongoDbJsonTckTests extends AbstractTckTests {
 		return getStateMachineFactoryFromContext().getStateMachine();
 	}
 
+	@Override
+	protected StateMachine<String, String> getSimpleSubMachine() throws Exception {
+		context.register(TestConfig.class, SimpleSubMachineConfig.class, StateMachineFactoryConfig.class);
+		context.refresh();
+		return getStateMachineFactoryFromContext().getStateMachine();
+	}
+
 	@Configuration
 	public static class SimpleMachineConfig {
 
@@ -90,6 +97,17 @@ public class MongoDbJsonTckTests extends AbstractTckTests {
 		}
 	}
 
+	@Configuration
+	public static class SimpleSubMachineConfig {
+
+		@Bean
+		public StateMachineJackson2RepositoryPopulatorFactoryBean jackson2RepositoryPopulatorFactoryBean() {
+			StateMachineJackson2RepositoryPopulatorFactoryBean factoryBean = new StateMachineJackson2RepositoryPopulatorFactoryBean();
+			factoryBean.setResources(new Resource[]{new ClassPathResource("org/springframework/statemachine/buildtests/tck/mongodb/SimpleSubMachine.json")});
+			return factoryBean;
+		}
+	}
+
 	@Configuration
 	@EnableStateMachineFactory
 	public static class StateMachineFactoryConfig extends StateMachineConfigurerAdapter<String, String> {
diff --git a/spring-statemachine-build-tests/src/test/java/org/springframework/statemachine/buildtests/tck/mongodb/MongoDbManualTckTests.java b/spring-statemachine-build-tests/src/test/java/org/springframework/statemachine/buildtests/tck/mongodb/MongoDbManualTckTests.java
index 780204a8..d4b7ee5e 100644
--- a/spring-statemachine-build-tests/src/test/java/org/springframework/statemachine/buildtests/tck/mongodb/MongoDbManualTckTests.java
+++ b/spring-statemachine-build-tests/src/test/java/org/springframework/statemachine/buildtests/tck/mongodb/MongoDbManualTckTests.java
@@ -96,6 +96,40 @@ public class MongoDbManualTckTests extends AbstractTckTests {
 		return getStateMachineFactoryFromContext().getStateMachine();
 	}
 
+	@Override
+	protected StateMachine<String, String> getSimpleSubMachine() throws Exception {
+		context.register(TestConfig.class, StateMachineFactoryConfig.class);
+		context.refresh();
+
+		MongoDbStateRepository stateRepository = context.getBean(MongoDbStateRepository.class);
+		MongoDbTransitionRepository transitionRepository = context.getBean(MongoDbTransitionRepository.class);
+
+		MongoDbRepositoryState stateS1 = new MongoDbRepositoryState("S1", true);
+		MongoDbRepositoryState stateS2 = new MongoDbRepositoryState("S2");
+		MongoDbRepositoryState stateS3 = new MongoDbRepositoryState("S3");
+
+		MongoDbRepositoryState stateS21 = new MongoDbRepositoryState("S21", true);
+		stateS21.setParentState(stateS2);
+		MongoDbRepositoryState stateS22 = new MongoDbRepositoryState("S22");
+		stateS22.setParentState(stateS2);
+
+		stateRepository.save(stateS1);
+		stateRepository.save(stateS2);
+		stateRepository.save(stateS3);
+		stateRepository.save(stateS21);
+		stateRepository.save(stateS22);
+
+		MongoDbRepositoryTransition transitionS1ToS2 = new MongoDbRepositoryTransition(stateS1, stateS2, "E1");
+		MongoDbRepositoryTransition transitionS2ToS3 = new MongoDbRepositoryTransition(stateS21, stateS22, "E2");
+		MongoDbRepositoryTransition transitionS21ToS22 = new MongoDbRepositoryTransition(stateS2, stateS3, "E3");
+
+		transitionRepository.save(transitionS1ToS2);
+		transitionRepository.save(transitionS2ToS3);
+		transitionRepository.save(transitionS21ToS22);
+
+		return getStateMachineFactoryFromContext().getStateMachine();
+	}
+
 	@Configuration
 	@EnableStateMachineFactory
 	public static class StateMachineFactoryConfig extends StateMachineConfigurerAdapter<String, String> {
diff --git a/spring-statemachine-build-tests/src/test/java/org/springframework/statemachine/buildtests/tck/redis/RedisJsonTckTests.java b/spring-statemachine-build-tests/src/test/java/org/springframework/statemachine/buildtests/tck/redis/RedisJsonTckTests.java
index e104f54b..01726e20 100644
--- a/spring-statemachine-build-tests/src/test/java/org/springframework/statemachine/buildtests/tck/redis/RedisJsonTckTests.java
+++ b/spring-statemachine-build-tests/src/test/java/org/springframework/statemachine/buildtests/tck/redis/RedisJsonTckTests.java
@@ -79,6 +79,13 @@ public class RedisJsonTckTests extends AbstractTckTests {
 		return getStateMachineFactoryFromContext().getStateMachine();
 	}
 
+	@Override
+	protected StateMachine<String, String> getSimpleSubMachine() throws Exception {
+		context.register(TestConfig.class, SimpleSubMachineConfig.class, StateMachineFactoryConfig.class);
+		context.refresh();
+		return getStateMachineFactoryFromContext().getStateMachine();
+	}
+
 	@Configuration
 	public static class SimpleMachineConfig {
 
@@ -90,6 +97,17 @@ public class RedisJsonTckTests extends AbstractTckTests {
 		}
 	}
 
+	@Configuration
+	public static class SimpleSubMachineConfig {
+
+		@Bean
+		public StateMachineJackson2RepositoryPopulatorFactoryBean jackson2RepositoryPopulatorFactoryBean() {
+			StateMachineJackson2RepositoryPopulatorFactoryBean factoryBean = new StateMachineJackson2RepositoryPopulatorFactoryBean();
+			factoryBean.setResources(new Resource[]{new ClassPathResource("org/springframework/statemachine/buildtests/tck/redis/SimpleSubMachine.json")});
+			return factoryBean;
+		}
+	}
+
 	@Configuration
 	@EnableStateMachineFactory
 	public static class StateMachineFactoryConfig extends StateMachineConfigurerAdapter<String, String> {
diff --git a/spring-statemachine-build-tests/src/test/java/org/springframework/statemachine/buildtests/tck/redis/RedisManualTckTests.java b/spring-statemachine-build-tests/src/test/java/org/springframework/statemachine/buildtests/tck/redis/RedisManualTckTests.java
index b7ac6db4..3289931c 100644
--- a/spring-statemachine-build-tests/src/test/java/org/springframework/statemachine/buildtests/tck/redis/RedisManualTckTests.java
+++ b/spring-statemachine-build-tests/src/test/java/org/springframework/statemachine/buildtests/tck/redis/RedisManualTckTests.java
@@ -97,6 +97,40 @@ public class RedisManualTckTests extends AbstractTckTests {
 		return getStateMachineFactoryFromContext().getStateMachine();
 	}
 
+	@Override
+	protected StateMachine<String, String> getSimpleSubMachine() throws Exception {
+		context.register(TestConfig.class, StateMachineFactoryConfig.class);
+		context.refresh();
+
+		RedisStateRepository stateRepository = context.getBean(RedisStateRepository.class);
+		RedisTransitionRepository transitionRepository = context.getBean(RedisTransitionRepository.class);
+
+		RedisRepositoryState stateS1 = new RedisRepositoryState("S1", true);
+		RedisRepositoryState stateS2 = new RedisRepositoryState("S2");
+		RedisRepositoryState stateS3 = new RedisRepositoryState("S3");
+
+		RedisRepositoryState stateS21 = new RedisRepositoryState("S21", true);
+		stateS21.setParentState(stateS2);
+		RedisRepositoryState stateS22 = new RedisRepositoryState("S22");
+		stateS22.setParentState(stateS2);
+
+		stateRepository.save(stateS1);
+		stateRepository.save(stateS2);
+		stateRepository.save(stateS3);
+		stateRepository.save(stateS21);
+		stateRepository.save(stateS22);
+
+		RedisRepositoryTransition transitionS1ToS2 = new RedisRepositoryTransition(stateS1, stateS2, "E1");
+		RedisRepositoryTransition transitionS2ToS3 = new RedisRepositoryTransition(stateS21, stateS22, "E2");
+		RedisRepositoryTransition transitionS21ToS22 = new RedisRepositoryTransition(stateS2, stateS3, "E3");
+
+		transitionRepository.save(transitionS1ToS2);
+		transitionRepository.save(transitionS2ToS3);
+		transitionRepository.save(transitionS21ToS22);
+
+		return getStateMachineFactoryFromContext().getStateMachine();
+	}
+
 	@Configuration
 	@EnableStateMachineFactory
 	public static class StateMachineFactoryConfig extends StateMachineConfigurerAdapter<String, String> {
diff --git a/spring-statemachine-build-tests/src/test/java/org/springframework/statemachine/buildtests/tck/uml/UmlTckTests.java b/spring-statemachine-build-tests/src/test/java/org/springframework/statemachine/buildtests/tck/uml/UmlTckTests.java
index d41bc11c..4673e303 100644
--- a/spring-statemachine-build-tests/src/test/java/org/springframework/statemachine/buildtests/tck/uml/UmlTckTests.java
+++ b/spring-statemachine-build-tests/src/test/java/org/springframework/statemachine/buildtests/tck/uml/UmlTckTests.java
@@ -46,6 +46,13 @@ public class UmlTckTests extends AbstractTckTests {
 		return getStateMachineFromContext();
 	}
 
+	@Override
+	protected StateMachine<String, String> getSimpleSubMachine() throws Exception {
+		context.register(SimpleSubMachineConfig.class);
+		context.refresh();
+		return getStateMachineFromContext();
+	}
+
 	@Configuration
 	@EnableStateMachine
 	public static class SimpleMachineConfig extends StateMachineConfigurerAdapter<String, String> {
@@ -62,4 +69,21 @@ public class UmlTckTests extends AbstractTckTests {
 			return new UmlStateMachineModelFactory("classpath:org/springframework/statemachine/buildtests/tck/uml/SimpleMachine.uml");
 		}
 	}
+
+	@Configuration
+	@EnableStateMachine
+	public static class SimpleSubMachineConfig extends StateMachineConfigurerAdapter<String, String> {
+
+		@Override
+		public void configure(StateMachineModelConfigurer<String, String> model) throws Exception {
+			model
+				.withModel()
+					.factory(modelFactory());
+		}
+
+		@Bean
+		public StateMachineModelFactory<String, String> modelFactory() {
+			return new UmlStateMachineModelFactory("classpath:org/springframework/statemachine/buildtests/tck/uml/SimpleSubMachine.uml");
+		}
+	}
 }
diff --git a/spring-statemachine-build-tests/src/test/resources/org/springframework/statemachine/buildtests/tck/jpa/SimpleSubMachine.json b/spring-statemachine-build-tests/src/test/resources/org/springframework/statemachine/buildtests/tck/jpa/SimpleSubMachine.json
new file mode 100644
index 00000000..49e032e9
--- /dev/null
+++ b/spring-statemachine-build-tests/src/test/resources/org/springframework/statemachine/buildtests/tck/jpa/SimpleSubMachine.json
@@ -0,0 +1,52 @@
+[
+	{
+		"@id": "1",
+		"_class": "org.springframework.statemachine.data.jpa.JpaRepositoryState",
+		"initial": true,
+		"state": "S1"
+	},
+	{
+		"@id": "2",
+		"_class": "org.springframework.statemachine.data.jpa.JpaRepositoryState",
+		"initial": false,
+		"state": "S2"
+	},
+	{
+		"@id": "3",
+		"_class": "org.springframework.statemachine.data.jpa.JpaRepositoryState",
+		"initial": true,
+		"parentState" : "2",
+		"state": "S21"
+	},
+	{
+		"@id": "4",
+		"_class": "org.springframework.statemachine.data.jpa.JpaRepositoryState",
+		"initial": false,
+		"parentState" : "2",
+		"state": "S22"
+	},
+	{
+		"@id": "5",
+		"_class": "org.springframework.statemachine.data.jpa.JpaRepositoryState",
+		"initial": false,
+		"state": "S3"
+	},
+	{
+		"_class": "org.springframework.statemachine.data.jpa.JpaRepositoryTransition",
+		"source": "1",
+		"target": "2",
+		"event": "E1"
+	},
+	{
+		"_class": "org.springframework.statemachine.data.jpa.JpaRepositoryTransition",
+		"source": "3",
+		"target": "4",
+		"event": "E2"
+	},
+	{
+		"_class": "org.springframework.statemachine.data.jpa.JpaRepositoryTransition",
+		"source": "2",
+		"target": "5",
+		"event": "E3"
+	}
+]
diff --git a/spring-statemachine-build-tests/src/test/resources/org/springframework/statemachine/buildtests/tck/mongodb/SimpleSubMachine.json b/spring-statemachine-build-tests/src/test/resources/org/springframework/statemachine/buildtests/tck/mongodb/SimpleSubMachine.json
new file mode 100644
index 00000000..feea5ff6
--- /dev/null
+++ b/spring-statemachine-build-tests/src/test/resources/org/springframework/statemachine/buildtests/tck/mongodb/SimpleSubMachine.json
@@ -0,0 +1,52 @@
+[
+	{
+		"@id": "1",
+		"_class": "org.springframework.statemachine.data.mongodb.MongoDbRepositoryState",
+		"initial": true,
+		"state": "S1"
+	},
+	{
+		"@id": "2",
+		"_class": "org.springframework.statemachine.data.mongodb.MongoDbRepositoryState",
+		"initial": false,
+		"state": "S2"
+	},
+	{
+		"@id": "3",
+		"_class": "org.springframework.statemachine.data.mongodb.MongoDbRepositoryState",
+		"initial": true,
+		"parentState" : "2",
+		"state": "S21"
+	},
+	{
+		"@id": "4",
+		"_class": "org.springframework.statemachine.data.mongodb.MongoDbRepositoryState",
+		"initial": false,
+		"parentState" : "2",
+		"state": "S22"
+	},
+	{
+		"@id": "5",
+		"_class": "org.springframework.statemachine.data.mongodb.MongoDbRepositoryState",
+		"initial": false,
+		"state": "S3"
+	},
+	{
+		"_class": "org.springframework.statemachine.data.mongodb.MongoDbRepositoryTransition",
+		"source": "1",
+		"target": "2",
+		"event": "E1"
+	},
+	{
+		"_class": "org.springframework.statemachine.data.mongodb.MongoDbRepositoryTransition",
+		"source": "3",
+		"target": "4",
+		"event": "E2"
+	},
+	{
+		"_class": "org.springframework.statemachine.data.mongodb.MongoDbRepositoryTransition",
+		"source": "2",
+		"target": "5",
+		"event": "E3"
+	}
+]
diff --git a/spring-statemachine-build-tests/src/test/resources/org/springframework/statemachine/buildtests/tck/redis/SimpleSubMachine.json b/spring-statemachine-build-tests/src/test/resources/org/springframework/statemachine/buildtests/tck/redis/SimpleSubMachine.json
new file mode 100644
index 00000000..583514e0
--- /dev/null
+++ b/spring-statemachine-build-tests/src/test/resources/org/springframework/statemachine/buildtests/tck/redis/SimpleSubMachine.json
@@ -0,0 +1,52 @@
+[
+	{
+		"@id": "1",
+		"_class": "org.springframework.statemachine.data.redis.RedisRepositoryState",
+		"initial": true,
+		"state": "S1"
+	},
+	{
+		"@id": "2",
+		"_class": "org.springframework.statemachine.data.redis.RedisRepositoryState",
+		"initial": false,
+		"state": "S2"
+	},
+	{
+		"@id": "3",
+		"_class": "org.springframework.statemachine.data.redis.RedisRepositoryState",
+		"initial": true,
+		"parentState" : "2",
+		"state": "S21"
+	},
+	{
+		"@id": "4",
+		"_class": "org.springframework.statemachine.data.redis.RedisRepositoryState",
+		"initial": false,
+		"parentState" : "2",
+		"state": "S22"
+	},
+	{
+		"@id": "5",
+		"_class": "org.springframework.statemachine.data.redis.RedisRepositoryState",
+		"initial": false,
+		"state": "S3"
+	},
+	{
+		"_class": "org.springframework.statemachine.data.redis.RedisRepositoryTransition",
+		"source": "1",
+		"target": "2",
+		"event": "E1"
+	},
+	{
+		"_class": "org.springframework.statemachine.data.redis.RedisRepositoryTransition",
+		"source": "3",
+		"target": "4",
+		"event": "E2"
+	},
+	{
+		"_class": "org.springframework.statemachine.data.redis.RedisRepositoryTransition",
+		"source": "2",
+		"target": "5",
+		"event": "E3"
+	}
+]
diff --git a/spring-statemachine-build-tests/src/test/resources/org/springframework/statemachine/buildtests/tck/uml/SimpleSubMachine.di b/spring-statemachine-build-tests/src/test/resources/org/springframework/statemachine/buildtests/tck/uml/SimpleSubMachine.di
new file mode 100644
index 00000000..bf9abab3
--- /dev/null
+++ b/spring-statemachine-build-tests/src/test/resources/org/springframework/statemachine/buildtests/tck/uml/SimpleSubMachine.di
@@ -0,0 +1,2 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xmi:XMI xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI"/>
diff --git a/spring-statemachine-build-tests/src/test/resources/org/springframework/statemachine/buildtests/tck/uml/SimpleSubMachine.notation b/spring-statemachine-build-tests/src/test/resources/org/springframework/statemachine/buildtests/tck/uml/SimpleSubMachine.notation
new file mode 100644
index 00000000..2a37c37b
--- /dev/null
+++ b/spring-statemachine-build-tests/src/test/resources/org/springframework/statemachine/buildtests/tck/uml/SimpleSubMachine.notation
@@ -0,0 +1,199 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<notation:Diagram xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:ecore="http://www.eclipse.org/emf/2002/Ecore" xmlns:notation="http://www.eclipse.org/gmf/runtime/1.0.2/notation" xmlns:style="http://www.eclipse.org/papyrus/infra/viewpoints/policy/style" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_B9kvMK8FEear5exMwQ8r0A" type="PapyrusUMLStateMachineDiagram" name="StateMachine Diagram" measurementUnit="Pixel">
+  <children xmi:type="notation:Shape" xmi:id="_B9kvMa8FEear5exMwQ8r0A" type="2000">
+    <children xmi:type="notation:DecorationNode" xmi:id="_B9kvMq8FEear5exMwQ8r0A" type="2001">
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_B9kvM68FEear5exMwQ8r0A" width="700" height="23"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_B9kvNK8FEear5exMwQ8r0A" type="2002">
+      <children xmi:type="notation:Shape" xmi:id="_B9kvNa8FEear5exMwQ8r0A" type="3000">
+        <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_B9kvNq8FEear5exMwQ8r0A" source="RegionAnnotationKey">
+          <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_B9kvN68FEear5exMwQ8r0A" key="RegionZoneKey" value=""/>
+        </eAnnotations>
+        <children xmi:type="notation:DecorationNode" xmi:id="_B9kvOK8FEear5exMwQ8r0A" type="3002">
+          <children xmi:type="notation:Shape" xmi:id="_E1TKQK8FEear5exMwQ8r0A" type="6000">
+            <children xmi:type="notation:DecorationNode" xmi:id="_E1TxUK8FEear5exMwQ8r0A" type="6001"/>
+            <children xmi:type="notation:DecorationNode" xmi:id="_E1TxUa8FEear5exMwQ8r0A" type="19003">
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_E1TxUq8FEear5exMwQ8r0A" x="40"/>
+            </children>
+            <children xmi:type="notation:DecorationNode" xmi:id="_E1UYYK8FEear5exMwQ8r0A" type="6002">
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_E1UYYa8FEear5exMwQ8r0A"/>
+            </children>
+            <element xmi:type="uml:State" href="SimpleSubMachine.uml#_E1JZQK8FEear5exMwQ8r0A"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_E1TKQa8FEear5exMwQ8r0A" x="98" y="48"/>
+          </children>
+          <children xmi:type="notation:Shape" xmi:id="_F9WXcK8FEear5exMwQ8r0A" type="8000">
+            <children xmi:type="notation:DecorationNode" xmi:id="_F9W-gK8FEear5exMwQ8r0A" type="8001">
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_F9W-ga8FEear5exMwQ8r0A" x="25" y="3"/>
+            </children>
+            <children xmi:type="notation:DecorationNode" xmi:id="_F9W-gq8FEear5exMwQ8r0A" type="8002">
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_F9W-g68FEear5exMwQ8r0A" x="25" y="-10"/>
+            </children>
+            <element xmi:type="uml:Pseudostate" href="SimpleSubMachine.uml#_F9PpwK8FEear5exMwQ8r0A"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_F9WXca8FEear5exMwQ8r0A" x="26" y="48"/>
+          </children>
+          <children xmi:type="notation:Shape" xmi:id="_JLsiwK8FEear5exMwQ8r0A" type="6000">
+            <children xmi:type="notation:DecorationNode" xmi:id="_JLsiwq8FEear5exMwQ8r0A" type="6001">
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_KH0z0K8FEear5exMwQ8r0A" width="255" height="23"/>
+            </children>
+            <children xmi:type="notation:DecorationNode" xmi:id="_JLsiw68FEear5exMwQ8r0A" type="19003">
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_JLsixK8FEear5exMwQ8r0A" x="40"/>
+            </children>
+            <children xmi:type="notation:DecorationNode" xmi:id="_JLtJ0K8FEear5exMwQ8r0A" type="6002">
+              <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_LvR50K8FEear5exMwQ8r0A" source="PapyrusCSSForceValue">
+                <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_LvR50a8FEear5exMwQ8r0A" key="visible" value="true"/>
+              </eAnnotations>
+              <children xmi:type="notation:Shape" xmi:id="_LvTvAK8FEear5exMwQ8r0A" type="3000">
+                <eAnnotations xmi:type="ecore:EAnnotation" xmi:id="_LvUWEa8FEear5exMwQ8r0A" source="RegionAnnotationKey">
+                  <details xmi:type="ecore:EStringToStringMapEntry" xmi:id="_LvUWEq8FEear5exMwQ8r0A" key="RegionZoneKey" value=""/>
+                </eAnnotations>
+                <children xmi:type="notation:DecorationNode" xmi:id="_LvTvAq8FEear5exMwQ8r0A" type="3002">
+                  <children xmi:type="notation:Shape" xmi:id="_LvVkMK8FEear5exMwQ8r0A" type="6000">
+                    <children xmi:type="notation:DecorationNode" xmi:id="_LvVkMq8FEear5exMwQ8r0A" type="6001"/>
+                    <children xmi:type="notation:DecorationNode" xmi:id="_LvVkM68FEear5exMwQ8r0A" type="19003">
+                      <layoutConstraint xmi:type="notation:Location" xmi:id="_LvVkNK8FEear5exMwQ8r0A" x="40"/>
+                    </children>
+                    <children xmi:type="notation:DecorationNode" xmi:id="_LvVkNa8FEear5exMwQ8r0A" type="6002">
+                      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LvVkNq8FEear5exMwQ8r0A"/>
+                    </children>
+                    <element xmi:type="uml:State" href="SimpleSubMachine.uml#_LvU9IK8FEear5exMwQ8r0A"/>
+                    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LvVkMa8FEear5exMwQ8r0A" x="73" y="17"/>
+                  </children>
+                  <children xmi:type="notation:Shape" xmi:id="_Qox_YK8FEear5exMwQ8r0A" type="8000">
+                    <children xmi:type="notation:DecorationNode" xmi:id="_Qox_Yq8FEear5exMwQ8r0A" type="8001">
+                      <layoutConstraint xmi:type="notation:Location" xmi:id="_QoymcK8FEear5exMwQ8r0A" x="25" y="3"/>
+                    </children>
+                    <children xmi:type="notation:DecorationNode" xmi:id="_Qoymca8FEear5exMwQ8r0A" type="8002">
+                      <layoutConstraint xmi:type="notation:Location" xmi:id="_Qoymcq8FEear5exMwQ8r0A" x="25" y="-10"/>
+                    </children>
+                    <element xmi:type="uml:Pseudostate" href="SimpleSubMachine.uml#_QonAQK8FEear5exMwQ8r0A"/>
+                    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_Qox_Ya8FEear5exMwQ8r0A" x="16" y="18"/>
+                  </children>
+                  <children xmi:type="notation:Shape" xmi:id="_SyZ-UK8FEear5exMwQ8r0A" type="6000">
+                    <children xmi:type="notation:DecorationNode" xmi:id="_SyalYK8FEear5exMwQ8r0A" type="6001"/>
+                    <children xmi:type="notation:DecorationNode" xmi:id="_SyalYa8FEear5exMwQ8r0A" type="19003">
+                      <layoutConstraint xmi:type="notation:Location" xmi:id="_SyalYq8FEear5exMwQ8r0A" x="40"/>
+                    </children>
+                    <children xmi:type="notation:DecorationNode" xmi:id="_SyalY68FEear5exMwQ8r0A" type="6002">
+                      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SyalZK8FEear5exMwQ8r0A"/>
+                    </children>
+                    <element xmi:type="uml:State" href="SimpleSubMachine.uml#_SyOYIK8FEear5exMwQ8r0A"/>
+                    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_SyZ-Ua8FEear5exMwQ8r0A" x="170" y="17"/>
+                  </children>
+                  <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LvUWEK8FEear5exMwQ8r0A"/>
+                </children>
+                <element xmi:type="uml:Region" href="SimpleSubMachine.uml#_LvSg4K8FEear5exMwQ8r0A"/>
+                <layoutConstraint xmi:type="notation:Bounds" xmi:id="_LvTvAa8FEear5exMwQ8r0A" width="255" height="142"/>
+              </children>
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JLtJ0a8FEear5exMwQ8r0A" y="23" width="255" height="142"/>
+            </children>
+            <element xmi:type="uml:State" href="SimpleSubMachine.uml#_JLj_4K8FEear5exMwQ8r0A"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_JLsiwa8FEear5exMwQ8r0A" x="221" y="42" width="255" height="165"/>
+          </children>
+          <children xmi:type="notation:Shape" xmi:id="_K5_QkK8FEear5exMwQ8r0A" type="6000">
+            <children xmi:type="notation:DecorationNode" xmi:id="_K5_Qkq8FEear5exMwQ8r0A" type="6001"/>
+            <children xmi:type="notation:DecorationNode" xmi:id="_K5_Qk68FEear5exMwQ8r0A" type="19003">
+              <layoutConstraint xmi:type="notation:Location" xmi:id="_K5_QlK8FEear5exMwQ8r0A" x="40"/>
+            </children>
+            <children xmi:type="notation:DecorationNode" xmi:id="_K5_Qla8FEear5exMwQ8r0A" type="6002">
+              <layoutConstraint xmi:type="notation:Bounds" xmi:id="_K5_Qlq8FEear5exMwQ8r0A"/>
+            </children>
+            <element xmi:type="uml:State" href="SimpleSubMachine.uml#_K52tsK8FEear5exMwQ8r0A"/>
+            <layoutConstraint xmi:type="notation:Bounds" xmi:id="_K5_Qka8FEear5exMwQ8r0A" x="551" y="48"/>
+          </children>
+          <layoutConstraint xmi:type="notation:Bounds" xmi:id="_B9kvOa8FEear5exMwQ8r0A"/>
+        </children>
+        <element xmi:type="uml:Region" href="SimpleSubMachine.uml#_B9i6AK8FEear5exMwQ8r0A"/>
+        <layoutConstraint xmi:type="notation:Bounds" xmi:id="_B9kvOq8FEear5exMwQ8r0A" width="700" height="287"/>
+      </children>
+      <layoutConstraint xmi:type="notation:Bounds" xmi:id="_B9kvO68FEear5exMwQ8r0A" y="23" width="700" height="287"/>
+    </children>
+    <element xmi:type="uml:StateMachine" href="SimpleSubMachine.uml#_B9VeoK8FEear5exMwQ8r0A"/>
+    <layoutConstraint xmi:type="notation:Bounds" xmi:id="_B9kvPK8FEear5exMwQ8r0A" x="30" y="30" width="700" height="310"/>
+  </children>
+  <styles xmi:type="notation:StringValueStyle" xmi:id="_B9kvPa8FEear5exMwQ8r0A" name="diagram_compatibility_version" stringValue="1.1.0"/>
+  <styles xmi:type="notation:DiagramStyle" xmi:id="_B9kvPq8FEear5exMwQ8r0A"/>
+  <styles xmi:type="style:PapyrusViewStyle" xmi:id="_B9kvP68FEear5exMwQ8r0A">
+    <owner xmi:type="uml:Model" href="SimpleSubMachine.uml#_B8yFAK8FEear5exMwQ8r0A"/>
+  </styles>
+  <element xmi:type="uml:StateMachine" href="SimpleSubMachine.uml#_B9VeoK8FEear5exMwQ8r0A"/>
+  <edges xmi:type="notation:Connector" xmi:id="_HvnmUK8FEear5exMwQ8r0A" type="7000" source="_F9WXcK8FEear5exMwQ8r0A" target="_E1TKQK8FEear5exMwQ8r0A">
+    <children xmi:type="notation:DecorationNode" xmi:id="_HvnmU68FEear5exMwQ8r0A" type="7001">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_HvnmVK8FEear5exMwQ8r0A"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_HvnmVa8FEear5exMwQ8r0A" type="7002">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_HvnmVq8FEear5exMwQ8r0A"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_HvnmV68FEear5exMwQ8r0A" type="7003">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_HvnmWK8FEear5exMwQ8r0A" y="60"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_HvnmUa8FEear5exMwQ8r0A"/>
+    <element xmi:type="uml:Transition" href="SimpleSubMachine.uml#_HuMC8K8FEear5exMwQ8r0A"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_HvnmUq8FEear5exMwQ8r0A" points="[8, 0, -57, 0]$[61, -1, -4, -1]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Hv7IUK8FEear5exMwQ8r0A" id="(1.0,0.45)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_Hv7IUa8FEear5exMwQ8r0A" id="(0.0,0.19148936170212766)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_SJe9IK8FEear5exMwQ8r0A" type="7000" source="_Qox_YK8FEear5exMwQ8r0A" target="_LvVkMK8FEear5exMwQ8r0A">
+    <children xmi:type="notation:DecorationNode" xmi:id="_SJfkMK8FEear5exMwQ8r0A" type="7001">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_SJfkMa8FEear5exMwQ8r0A"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_SJfkMq8FEear5exMwQ8r0A" type="7002">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_SJfkM68FEear5exMwQ8r0A"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_SJfkNK8FEear5exMwQ8r0A" type="7003">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_SJfkNa8FEear5exMwQ8r0A" y="60"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_SJe9Ia8FEear5exMwQ8r0A"/>
+    <element xmi:type="uml:Transition" href="SimpleSubMachine.uml#_SJSI0K8FEear5exMwQ8r0A"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_SJe9Iq8FEear5exMwQ8r0A" points="[8, 3, -30, 21]$[40, -15, 2, 3]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_SKAhkK8FEear5exMwQ8r0A" id="(1.0,0.5)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_SKAhka8FEear5exMwQ8r0A" id="(0.0,0.23404255319148937)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_t3EegK8FEear5exMwQ8r0A" type="7000" source="_E1TKQK8FEear5exMwQ8r0A" target="_JLsiwK8FEear5exMwQ8r0A">
+    <children xmi:type="notation:DecorationNode" xmi:id="_t3FFkK8FEear5exMwQ8r0A" type="7001">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_t3FFka8FEear5exMwQ8r0A"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_t3FFkq8FEear5exMwQ8r0A" type="7002">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_t3FFk68FEear5exMwQ8r0A" x="-5" y="-14"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_t3FFlK8FEear5exMwQ8r0A" type="7003">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_t3FFla8FEear5exMwQ8r0A" y="60"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_t3Eega8FEear5exMwQ8r0A"/>
+    <element xmi:type="uml:Transition" href="SimpleSubMachine.uml#_t23DIK8FEear5exMwQ8r0A"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_t3Eegq8FEear5exMwQ8r0A" points="[6, 0, -83, 0]$[89, 0, 0, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_t3ofMK8FEear5exMwQ8r0A" id="(1.0,0.46808510638297873)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_t3ofMa8FEear5exMwQ8r0A" id="(0.0,0.1696969696969697)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_vKeAEK8FEear5exMwQ8r0A" type="7000" source="_LvVkMK8FEear5exMwQ8r0A" target="_SyZ-UK8FEear5exMwQ8r0A">
+    <children xmi:type="notation:DecorationNode" xmi:id="_vKenIK8FEear5exMwQ8r0A" type="7001">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_vKenIa8FEear5exMwQ8r0A"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_vKenIq8FEear5exMwQ8r0A" type="7002">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_vKenI68FEear5exMwQ8r0A" x="-4" y="-13"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_vKenJK8FEear5exMwQ8r0A" type="7003">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_vKenJa8FEear5exMwQ8r0A" y="60"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_vKeAEa8FEear5exMwQ8r0A"/>
+    <element xmi:type="uml:Transition" href="SimpleSubMachine.uml#_vKRy0K8FEear5exMwQ8r0A"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_vKeAEq8FEear5exMwQ8r0A" points="[7, -1, -60, 0]$[64, -2, -3, -1]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vK_kgK8FEear5exMwQ8r0A" id="(1.0,0.46808510638297873)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_vK_kga8FEear5exMwQ8r0A" id="(0.0,0.46808510638297873)"/>
+  </edges>
+  <edges xmi:type="notation:Connector" xmi:id="_wOfo4K8FEear5exMwQ8r0A" type="7000" source="_JLsiwK8FEear5exMwQ8r0A" target="_K5_QkK8FEear5exMwQ8r0A">
+    <children xmi:type="notation:DecorationNode" xmi:id="_wOfo468FEear5exMwQ8r0A" type="7001">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_wOfo5K8FEear5exMwQ8r0A"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_wOgP8K8FEear5exMwQ8r0A" type="7002">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_wOgP8a8FEear5exMwQ8r0A" x="-3" y="-13"/>
+    </children>
+    <children xmi:type="notation:DecorationNode" xmi:id="_wOgP8q8FEear5exMwQ8r0A" type="7003">
+      <layoutConstraint xmi:type="notation:Location" xmi:id="_wOgP868FEear5exMwQ8r0A" y="60"/>
+    </children>
+    <styles xmi:type="notation:FontStyle" xmi:id="_wOfo4a8FEear5exMwQ8r0A"/>
+    <element xmi:type="uml:Transition" href="SimpleSubMachine.uml#_wORmcK8FEear5exMwQ8r0A"/>
+    <bendpoints xmi:type="notation:RelativeBendpoints" xmi:id="_wOfo4q8FEear5exMwQ8r0A" points="[8, 0, -81, -1]$[83, 1, -6, 0]"/>
+    <sourceAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wPDCgK8FEear5exMwQ8r0A" id="(1.0,0.17575757575757575)"/>
+    <targetAnchor xmi:type="notation:IdentityAnchor" xmi:id="_wPDpkK8FEear5exMwQ8r0A" id="(0.0,0.48936170212765956)"/>
+  </edges>
+</notation:Diagram>
diff --git a/spring-statemachine-build-tests/src/test/resources/org/springframework/statemachine/buildtests/tck/uml/SimpleSubMachine.uml b/spring-statemachine-build-tests/src/test/resources/org/springframework/statemachine/buildtests/tck/uml/SimpleSubMachine.uml
new file mode 100644
index 00000000..0eb5b58d
--- /dev/null
+++ b/spring-statemachine-build-tests/src/test/resources/org/springframework/statemachine/buildtests/tck/uml/SimpleSubMachine.uml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<uml:Model xmi:version="20131001" xmlns:xmi="http://www.omg.org/spec/XMI/20131001" xmlns:uml="http://www.eclipse.org/uml2/5.0.0/UML" xmi:id="_B8yFAK8FEear5exMwQ8r0A" name="RootElement">
+  <packagedElement xmi:type="uml:StateMachine" xmi:id="_B9VeoK8FEear5exMwQ8r0A" name="StateMachine">
+    <region xmi:type="uml:Region" xmi:id="_B9i6AK8FEear5exMwQ8r0A" name="Region1">
+      <transition xmi:type="uml:Transition" xmi:id="_HuMC8K8FEear5exMwQ8r0A" source="_F9PpwK8FEear5exMwQ8r0A" target="_E1JZQK8FEear5exMwQ8r0A"/>
+      <transition xmi:type="uml:Transition" xmi:id="_t23DIK8FEear5exMwQ8r0A" source="_E1JZQK8FEear5exMwQ8r0A" target="_JLj_4K8FEear5exMwQ8r0A">
+        <trigger xmi:type="uml:Trigger" xmi:id="_yyyxoK8FEear5exMwQ8r0A" event="_lruNsK8FEear5exMwQ8r0A"/>
+      </transition>
+      <transition xmi:type="uml:Transition" xmi:id="_wORmcK8FEear5exMwQ8r0A" source="_JLj_4K8FEear5exMwQ8r0A" target="_K52tsK8FEear5exMwQ8r0A">
+        <trigger xmi:type="uml:Trigger" xmi:id="_3dBsIK8FEear5exMwQ8r0A" event="_qPDO8K8FEear5exMwQ8r0A"/>
+      </transition>
+      <subvertex xmi:type="uml:State" xmi:id="_E1JZQK8FEear5exMwQ8r0A" name="S1"/>
+      <subvertex xmi:type="uml:Pseudostate" xmi:id="_F9PpwK8FEear5exMwQ8r0A" name=""/>
+      <subvertex xmi:type="uml:State" xmi:id="_JLj_4K8FEear5exMwQ8r0A" name="S2">
+        <region xmi:type="uml:Region" xmi:id="_LvSg4K8FEear5exMwQ8r0A" name="Region1">
+          <transition xmi:type="uml:Transition" xmi:id="_SJSI0K8FEear5exMwQ8r0A" source="_QonAQK8FEear5exMwQ8r0A" target="_LvU9IK8FEear5exMwQ8r0A"/>
+          <transition xmi:type="uml:Transition" xmi:id="_vKRy0K8FEear5exMwQ8r0A" source="_LvU9IK8FEear5exMwQ8r0A" target="_SyOYIK8FEear5exMwQ8r0A">
+            <trigger xmi:type="uml:Trigger" xmi:id="_0-sogK8FEear5exMwQ8r0A" event="_n2Z8kK8FEear5exMwQ8r0A"/>
+          </transition>
+          <subvertex xmi:type="uml:State" xmi:id="_LvU9IK8FEear5exMwQ8r0A" name="S21"/>
+          <subvertex xmi:type="uml:Pseudostate" xmi:id="_QonAQK8FEear5exMwQ8r0A" name=""/>
+          <subvertex xmi:type="uml:State" xmi:id="_SyOYIK8FEear5exMwQ8r0A" name="S22"/>
+        </region>
+      </subvertex>
+      <subvertex xmi:type="uml:State" xmi:id="_K52tsK8FEear5exMwQ8r0A" name="S3"/>
+    </region>
+  </packagedElement>
+  <packagedElement xmi:type="uml:Signal" xmi:id="_gPi44K8FEear5exMwQ8r0A" name="E1"/>
+  <packagedElement xmi:type="uml:Signal" xmi:id="_iyXa8K8FEear5exMwQ8r0A" name="E2"/>
+  <packagedElement xmi:type="uml:Signal" xmi:id="_kNn4AK8FEear5exMwQ8r0A" name="E3"/>
+  <packagedElement xmi:type="uml:SignalEvent" xmi:id="_lruNsK8FEear5exMwQ8r0A" name="SignalEventE1" signal="_gPi44K8FEear5exMwQ8r0A"/>
+  <packagedElement xmi:type="uml:SignalEvent" xmi:id="_n2Z8kK8FEear5exMwQ8r0A" name="SignalEventE2" signal="_iyXa8K8FEear5exMwQ8r0A"/>
+  <packagedElement xmi:type="uml:SignalEvent" xmi:id="_qPDO8K8FEear5exMwQ8r0A" name="SignalEventE3" signal="_kNn4AK8FEear5exMwQ8r0A"/>
+</uml:Model>