diff --git a/Makefile b/Makefile
index 960ab28..b03a96b 100644
--- a/Makefile
+++ b/Makefile
@@ -8,3 +8,6 @@ sd-image: build
 
 shell: build
 	docker run -ti --privileged -v $(shell pwd):/workspace -v /boot:/boot -v /lib/modules:/lib/modules image-builder-odroid-c1 bash
+
+testshell: build
+	docker run -ti --privileged -v $(shell pwd)/builder:/builder -v $(shell pwd):/workspace -v /boot:/boot -v /lib/modules:/lib/modules image-builder-odroid-c1 bash
diff --git a/builder/test/os-release_spec.rb b/builder/test/os-release_spec.rb
new file mode 100644
index 0000000..cc4e247
--- /dev/null
+++ b/builder/test/os-release_spec.rb
@@ -0,0 +1,35 @@
+require 'serverspec'
+set :backend, :exec
+
+describe "Root filesystem" do
+  let(:rootfs_path) { return '/build' }
+
+  it "exists" do
+    rootfs_dir = file(rootfs_path)
+
+    expect(rootfs_dir).to exist
+  end
+
+  context "Hypriot OS Release in /etc/os-release" do
+    let(:stdout) { command("cat #{rootfs_path}/etc/os-release").stdout }
+
+    it "has a HYPRIOT_OS= entry" do
+      expect(stdout).to contain('^HYPRIOT_OS=')
+    end
+    it "has a HYPRIOT_TAG= entry" do
+      expect(stdout).to contain('^HYPRIOT_TAG=')
+    end
+    it "has a HYPRIOT_DEVICE= entry" do
+      expect(stdout).to contain('^HYPRIOT_DEVICE=')
+    end
+
+    it "is for architecure 'HYPRIOT_OS=\"HypriotOS/armhf\"'" do
+      expect(stdout).to contain('^HYPRIOT_OS="HypriotOS/armhf"$')
+    end
+
+    it "is for device 'HYPRIOT_DEVICE=\"ODROID C1/C1+\"'" do
+      expect(stdout).to contain('^HYPRIOT_DEVICE="ODROID C1/C1\+"$')
+    end
+
+  end
+end