diff --git a/MAC/Test/Station/Makefile.am b/MAC/Test/Station/Makefile.am
index 78242750642d354e7e4b4f2dd48475531feef650..4c094293917318ca8992b2fca5f67f12454eba5c 100644
--- a/MAC/Test/Station/Makefile.am
+++ b/MAC/Test/Station/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS = modules gold tc
 
-testdir		 =  $(prefix)/test
+testdir		 =  $(prefix)/stationtest
 test_SCRIPTS = 	README.txt \
 				i2c_spu.py \
 				i2c_td.py \
@@ -21,4 +21,3 @@ test_SCRIPTS = 	README.txt \
 				xc_200_verify.sh 
 
 include $(top_srcdir)/Makefile.common
-
diff --git a/MAC/Test/Station/gold/Makefile.am b/MAC/Test/Station/gold/Makefile.am
index ff8ddc66357235f1a3b0285fb425ac3f8e308e7e..46aa24695c7dcfad3a14ecee01a2319f53a15a37 100644
--- a/MAC/Test/Station/gold/Makefile.am
+++ b/MAC/Test/Station/gold/Makefile.am
@@ -1,4 +1,4 @@
-testdir		 =  $(prefix)/test/gold
+testdir		 =  $(prefix)/stationtest/gold
 test_SCRIPTS = 	prbs_dir_test.gold \
 				rsp_version.gold \
 				tbb_version.gold \
@@ -7,4 +7,3 @@ test_SCRIPTS = 	prbs_dir_test.gold \
 				xst_200_odd.gold
 
 include $(top_srcdir)/Makefile.common
-
diff --git a/MAC/Test/Station/modules/Makefile.am b/MAC/Test/Station/modules/Makefile.am
index 859007b445163b225eb0f0ebf8a9230f15c97954..0d289bbe166c99550d2ac031f1a2b7be228670b9 100644
--- a/MAC/Test/Station/modules/Makefile.am
+++ b/MAC/Test/Station/modules/Makefile.am
@@ -1,4 +1,4 @@
-testdir		 =	$(prefix)/test/modules
+testdir		 =	$(prefix)/stationtest/modules
 test_SCRIPTS = 	cli.py \
 				mep.py \
 				rsp.py \
@@ -7,4 +7,3 @@ test_SCRIPTS = 	cli.py \
 				testlog.py
 
 include $(top_srcdir)/Makefile.common
-
diff --git a/MAC/Test/Station/tc/Makefile.am b/MAC/Test/Station/tc/Makefile.am
index a0c4ef7dd058d89c8e3cfac8b5da2df0760eba1f..8bee11394e1dd9254b3d0236bd68d3ac3d8c5e29 100644
--- a/MAC/Test/Station/tc/Makefile.am
+++ b/MAC/Test/Station/tc/Makefile.am
@@ -1,10 +1,10 @@
-testdir		 =  $(prefix)/test/tc
+testdir		 =  $(prefix)/stationtest/tc
 test_SCRIPTS = 	bist.py \
 				empty.py \
 				hba_client.py \
 				hba_server.py \
 				prsg.py \
-				rad_lane_mode.py \
+				rad_lanemode.py \
 				rad_latency.py \
 				serdes.py \
 				spustat.py \
@@ -13,4 +13,3 @@ test_SCRIPTS = 	bist.py \
 				tdstat.py
 
 include $(top_srcdir)/Makefile.common
-