diff --git a/sbroad-core/src/frontend/sql/ir/tests.rs b/sbroad-core/src/frontend/sql/ir/tests.rs
index 61f1b140285f53c45b785b5d0281f5499aa57cb2..e5bc1ff455bd305ef2790408d9730ec079d3f5e0 100644
--- a/sbroad-core/src/frontend/sql/ir/tests.rs
+++ b/sbroad-core/src/frontend/sql/ir/tests.rs
@@ -3790,7 +3790,30 @@ fn front_mock_set_param_transaction() {
     }
 }
 
-// TODO: add test for create table in tier syntax
+#[test]
+fn front_create_table_with_tier_syntax() {
+    let query = r#"CREATE TABLE warehouse (
+        id INTEGER PRIMARY KEY,
+        type TEXT NOT NULL)
+        USING memtx
+        DISTRIBUTED BY (id)
+        IN TIER "default";"#;
+
+    let metadata = &RouterConfigurationMock::new();
+    let plan = AbstractSyntaxTree::transform_into_plan(query, metadata);
+    assert!(plan.is_ok());
+
+    let query = r#"CREATE TABLE warehouse (
+        id INTEGER PRIMARY KEY,
+        type TEXT NOT NULL)
+        USING memtx
+        DISTRIBUTED BY (id)
+        IN TIER;"#;
+
+    let metadata = &RouterConfigurationMock::new();
+    let plan = AbstractSyntaxTree::transform_into_plan(query, metadata);
+    assert!(plan.is_err());
+}
 
 #[test]
 fn front_alter_system_check_parses_ok() {