diff --git a/src/app/ccs811test/Makefile.inc b/src/app/ccs811test/Makefile.inc
new file mode 100644
index 0000000000000000000000000000000000000000..b6920c970f67c9c2a11d7a85f7f2b9e2d2109c20
--- /dev/null
+++ b/src/app/ccs811test/Makefile.inc
@@ -0,0 +1,3 @@
+arch_drivers += ,i2c
+drivers += ,ccs811
+loop ?= 1
diff --git a/src/app/ccs811test/main.cc b/src/app/ccs811test/main.cc
new file mode 100644
index 0000000000000000000000000000000000000000..a1052f6c142b0f11a4e22dd2dbf3103622377c76
--- /dev/null
+++ b/src/app/ccs811test/main.cc
@@ -0,0 +1,34 @@
+#include "arch.h"
+#include "driver/gpio.h"
+#include "driver/stdout.h"
+#if defined(MULTIPASS_ARCH_HAS_I2C) && !defined(DRIVER_SOFTI2C)
+#include "driver/i2c.h"
+#else
+#include "driver/soft_i2c.h"
+#endif
+#include "driver/ccs811.h"
+
+void loop(void)
+{
+	kout << "CCS811 status is " << ccs811.check() << endl;
+}
+
+int main(void)
+{
+
+	arch.setup();
+	gpio.setup();
+	kout.setup();
+
+	if (i2c.setup() != 0) {
+		return 1;
+	}
+
+	kout << "I2C setup OK" << endl;
+
+	ccs811.init();
+
+	arch.idle_loop();
+
+	return 0;
+}