diff --git a/tests/08-state-hierarchy.cpp b/tests/08-state-hierarchy.cpp
index 4b4c19f..7699f17 100644
--- a/tests/08-state-hierarchy.cpp
+++ b/tests/08-state-hierarchy.cpp
@@ -33,12 +33,16 @@ int main(int argc, char** argv)
 	StateMachine* sm = d.new_state_machine("SM");
 
 	State* parent1 = d.new_state(sm, "Parent 0");
-
 	try {
 		// check id uniqueness
 		d.new_state(sm, "n0", "test");
 	} catch (const Cyberiada::ParametersException&){
 	}
+	try {
+		// check non-empty name
+		d.new_state(sm, "");
+	} catch (const Cyberiada::ParametersException&){
+	}
 	
 	CYB_ASSERT(parent1->is_simple_state());
 	d.new_state(parent1, "State 0-0");
diff --git a/tests/09-initial.cpp b/tests/09-initial.cpp
index 540213a..75c150a 100644
--- a/tests/09-initial.cpp
+++ b/tests/09-initial.cpp
@@ -38,6 +38,11 @@ int main(int argc, char** argv)
 		d.new_initial(sm, "n0");
 	} catch (const Cyberiada::ParametersException&){
 	}
+	try {
+		// check non-empty name
+		d.new_initial(sm, "");
+	} catch (const Cyberiada::ParametersException&){
+	}
 	
 	State* parent = d.new_state(sm, "State");
 	d.new_initial(parent, "Local init");
diff --git a/tests/10-final.cpp b/tests/10-final.cpp
index 7112c32..cc7c618 100644
--- a/tests/10-final.cpp
+++ b/tests/10-final.cpp
@@ -38,6 +38,11 @@ int main(int argc, char** argv)
 		d.new_final(sm, "n0", "test");
 	} catch (const Cyberiada::ParametersException&){
 	}
+	try {
+		// check non-empty name
+		d.new_final(sm, "");
+	} catch (const Cyberiada::ParametersException&){
+	}
 	
 	State* parent = d.new_state(sm, "State");
 	d.new_final(parent, "Local exit");
diff --git a/tests/11-choice.cpp b/tests/11-choice.cpp
index 3c5b616..a6573f2 100644
--- a/tests/11-choice.cpp
+++ b/tests/11-choice.cpp
@@ -38,6 +38,11 @@ int main(int argc, char** argv)
 		d.new_choice(sm, "n0", "test");
 	} catch (const Cyberiada::ParametersException&){
 	}
+	try {
+		// check non-empty name
+		d.new_choice(sm, "");
+	} catch (const Cyberiada::ParametersException&){
+	}
 	
 	State* parent = d.new_state(sm, "State");
 	d.new_choice(parent, "Local choice");