diff --git a/tests/testRingbuffer/Makefile b/tests/Makefile
similarity index 58%
rename from tests/testRingbuffer/Makefile
rename to tests/Makefile
index a0397fc..072476b 100644
--- a/tests/testRingbuffer/Makefile
+++ b/tests/Makefile
@@ -1,17 +1,20 @@
-CFLAGS=-I../../cube/User/Inc
+CFLAGS=-I../cube/User/Inc
 
 test:	ringbuffer.o test.o
 	gcc -o $@ -lcunit $^
-	./test
 
-ringbuffer.o: ../../cube/User/Src/ringbuffer.c
+ringbuffer.o: ../cube/User/Src/ringbuffer.c
 	gcc -c -o $@ $(CFLAGS) $^
 
 test.o:	test.c
 	gcc -c -o $@ $(CFLAGS) $^
 
 
+.PHONY: run
+run:	test
+	./test
+
 .PHONY: clean
 clean:
-	-rm *.o test
+	rm -f *.o test
 
diff --git a/tests/testRingbuffer/test.c b/tests/test.c
similarity index 100%
rename from tests/testRingbuffer/test.c
rename to tests/test.c
diff --git a/tools/startBuildEnv.ps1 b/tools/startBuildEnv.ps1
new file mode 100644
index 0000000..d0b2d40
--- /dev/null
+++ b/tools/startBuildEnv.ps1
@@ -0,0 +1 @@
+docker run -it --rm -v ${PWD}:/mnt wollud1969/build-env-arm-none-eabi:1.1.0 bash
diff --git a/tools/startTestEnv.ps1 b/tools/startTestEnv.ps1
new file mode 100644
index 0000000..335ee03
--- /dev/null
+++ b/tools/startTestEnv.ps1
@@ -0,0 +1 @@
+docker run -it --rm -v ${PWD}:/work wollud1969/build-env-c:1.2.0 bash