diff --git a/tests/core/types/clause/CMakeLists.txt b/tests/core/types/clause/CMakeLists.txt
index 1bd41fe8..8c44971c 100644
--- a/tests/core/types/clause/CMakeLists.txt
+++ b/tests/core/types/clause/CMakeLists.txt
@@ -28,6 +28,8 @@ function(test_compile name)
     target_link_libraries(${target} PRIVATE sqlpp11::sqlpp11 sqlpp11_testing)
 endfunction()
 
+test_compile(cte)
+test_compile(from)
 test_compile(group_by)
 test_compile(into)
 test_compile(select_columns)
diff --git a/tests/core/types/clause/cte.cpp b/tests/core/types/clause/cte.cpp
new file mode 100644
index 00000000..8d73fc75
--- /dev/null
+++ b/tests/core/types/clause/cte.cpp
@@ -0,0 +1,79 @@
+/*
+ * Copyright (c) 2024, Roland Bock
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *  * Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *  * Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "Sample.h"
+#include <sqlpp11/sqlpp11.h>
+
+void test_cte()
+{
+  const auto foo = test::TabFoo{};
+  const auto bar = test::TabBar{};
+
+#warning: add more tests
+  // Simple CTE: X AS SELECT
+  {
+    auto x = cte(sqlpp::alias::x).as(select(foo.id).from(foo).unconditionally());
+    auto a = x.as(sqlpp::alias::a);
+
+    using X = decltype(x);
+    using R = decltype(make_table_ref(x));
+    using A = decltype(a);
+
+    static_assert(sqlpp::is_cte<X>::value, "");
+    static_assert(not sqlpp::is_recursive_cte<X>::value, "");
+    static_assert(sqlpp::is_table<X>::value, "");
+    static_assert(sqlpp::required_ctes_of_t<X>::empty(), "");
+    static_assert(std::is_same<sqlpp::provided_ctes_of_t<X>, sqlpp::detail::type_vector<R>>::value, "");
+  }
+
+  // Non-recursive union CTE: X AS SELECT ... UNION ALL SELECT ...
+  {
+    auto x =
+        cte(sqlpp::alias::x)
+            .as(select(foo.id).from(foo).unconditionally().union_all(select(bar.id).from(bar).unconditionally()));
+    auto a = x.as(sqlpp::alias::a);
+  }
+
+  // Recursive union CTE: X AS SELECT ... UNION ALL SELECT ... FROM X ...
+  {
+    auto x_base = cte(sqlpp::alias::x).as(select(sqlpp::value(0).as(sqlpp::alias::a)));
+    auto x = x_base.union_all(select((x_base.a + 1).as(sqlpp::alias::a)).from(x_base).where(x_base.a < 10));
+    auto y = x.as(sqlpp::alias::y);
+   }
+
+  // A CTE depending on another CTE
+  {
+    auto x = cte(sqlpp::alias::x).as(select(foo.id).from(foo).unconditionally());
+    auto y = cte(sqlpp::alias::y).as(select(x.id, sqlpp::value(7).as(sqlpp::alias::a)).from(x).unconditionally());
+    auto z = y.as(sqlpp::alias::z);
+   }
+
+}
+
+int main()
+{
+  void test_cte();
+}
+
diff --git a/tests/core/types/clause/from.cpp b/tests/core/types/clause/from.cpp
new file mode 100644
index 00000000..71451873
--- /dev/null
+++ b/tests/core/types/clause/from.cpp
@@ -0,0 +1,54 @@
+/*
+ * Copyright (c) 2024, Roland Bock
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *
+ *  * Redistributions of source code must retain the above copyright notice,
+ *    this list of conditions and the following disclaimer.
+ *  * Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#include "Sample.h"
+#include <sqlpp11/sqlpp11.h>
+
+void test_from()
+{
+  const auto foo = test::TabFoo{};
+  const auto bar = test::TabBar{};
+
+#warning: need more tests with tables and joins
+
+  // FROM CTE
+  {
+    auto x = cte(sqlpp::alias::x).as(select(foo.id).from(foo).unconditionally());
+    auto f = from(x);
+
+    using R = decltype(make_table_ref(x));
+    using F = decltype(f);
+
+    static_assert(std::is_same<sqlpp::provided_tables_of_t<F>, sqlpp::detail::type_vector<R>>::value, "");
+    static_assert(std::is_same<sqlpp::required_ctes_of_t<F>, sqlpp::detail::type_vector<R>>::value, "");
+  }
+
+}
+
+int main()
+{
+  void test_from();
+}
+