diff --git a/.travis.yml b/.travis.yml
index de51b24..8db18f3 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,4 +24,4 @@ matrix:
 install: true
 
 script:
-    - cd test; make all
+    - cd libvhdl/test; make all
diff --git a/test/Makefile b/test/Makefile
index 74743a9..7912de1 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -9,14 +9,6 @@ VHD_STD := 08
 all: queue dict stack sim wishbone
 
 
-.PHONY: vhdl2008
-vhdl2008 : $(VHD08_SRC)/env_c.vhdl $(VHD08_SRC)/numeric_std_additions.vhdl $(VHD08_SRC)/numeric_std_unsigned_c.vhdl \
-$(VHD08_SRC)/standard_additions_c.vhdl $(VHD08_SRC)/standard_textio_additions_c.vhdl $(VHD08_SRC)/std_logic_1164_additions.vhdl
-	ghdl -a --std=$(VHD_STD) --work=ieee_proposed $(VHD08_SRC)/standard_additions_c.vhdl \
-	$(VHD08_SRC)/standard_textio_additions_c.vhdl $(VHD08_SRC)/std_logic_1164_additions.vhdl $(VHD08_SRC)/numeric_std_additions.vhdl \
-	$(VHD08_SRC)/numeric_std_unsigned_c.vhdl $(VHD08_SRC)/env_c.vhdl
-
-
 RandomPkg.o: OSVVM/SortListPkg_int.vhd OSVVM/RandomBasePkg.vhd OSVVM/RandomPkg.vhd
 	ghdl -a --std=$(VHD_STD) --work=osvvm $^
 
@@ -92,4 +84,3 @@ clean:
 
 .PHONY: distclean
 distclean: clean
-	rm -f $(VHD08_SRC)/*.vhdl
diff --git a/test/vhdl_2008/env_c.vhdl.patch b/test/vhdl_2008/env_c.vhdl.patch
deleted file mode 100644
index 572b116..0000000
--- a/test/vhdl_2008/env_c.vhdl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- env_c.vhdl	2014-11-20 11:18:24.210947993 +0100
-+++ env_c.vhdl_patched	2014-11-20 11:18:38.578652227 +0100
-@@ -30,7 +30,7 @@
-       1 ms, 10 ms, 100 ms,
-       1 sec, 10 sec, 100 sec,
-       1 min, 10 min, 100 min,
--      1 hr, 10 hr, 100 hr
-+      1 hr  --, 10 hr, 100 hr (removed for GHDL)
-       ) ;
- 
-   function RESOLUTION_LIMIT return DELAY_LENGTH is