diff --git a/tests/cssflexbox/config.yml b/tests/cssflexbox/config.yml
new file mode 100644
index 0000000..2376b33
--- /dev/null
+++ b/tests/cssflexbox/config.yml
@@ -0,0 +1,5 @@
+---
+  r: 2
+  spec: "http://www.w3.org/TR/css3-flexbox/"
+  sources: ["https://github.com/Modernizr/Modernizr"]
+  title: "CSS3 Flexbox"
diff --git a/tests/cssflexbox/test.js b/tests/cssflexbox/test.js
new file mode 100644
index 0000000..db677cf
--- /dev/null
+++ b/tests/cssflexbox/test.js
@@ -0,0 +1,27 @@
+// test("CSS Flexbox", function() {
+//   // Need baseline test
+// });
+
+test("CSS Flexbox, flex-align", function() {
+  var div = document.createElement("div");
+
+  assert( H.test.cssProp( div, "flexAlign", true ), "flexAlign supported" );
+});
+
+test("CSS Flexbox, flex-flow", function() {
+  var div = document.createElement("div");
+
+  assert( H.test.cssProp( div, "flexFlow", true ), "flexFlow supported" );
+});
+
+test("CSS Flexbox, flex-pack", function() {
+  var div = document.createElement("div");
+
+  assert( H.test.cssProp( div, "flexPack", true ), "flexPack supported" );
+});
+
+test("CSS Flexbox, flex-order", function() {
+  var div = document.createElement("div");
+
+  assert( H.test.cssProp( div, "flexOrder", true ), "flexOrder supported" );
+});