diff --git a/lib/sata/link/test/Makefile b/lib/sata/test/Makefile
similarity index 93%
rename from lib/sata/link/test/Makefile
rename to lib/sata/test/Makefile
index e516221c2..abb4d6053 100644
--- a/lib/sata/link/test/Makefile
+++ b/lib/sata/test/Makefile
@@ -1,4 +1,4 @@
-MSCDIR = ../../../../
+MSCDIR = ../../../
 PYTHON = python3
 
 CMD = PYTHONPATH=$(MSCDIR) $(PYTHON)
diff --git a/lib/sata/link/test/bfm.py b/lib/sata/test/bfm.py
similarity index 99%
rename from lib/sata/link/test/bfm.py
rename to lib/sata/test/bfm.py
index f67914603..af7a26857 100644
--- a/lib/sata/link/test/bfm.py
+++ b/lib/sata/test/bfm.py
@@ -3,9 +3,10 @@ import subprocess
 from migen.fhdl.std import *
 
 from lib.sata.std import *
-from lib.sata.link.test.common import *
 from lib.sata.transport.std import *
 
+from lib.sata.test.common import *
+
 class PHYDword:
 	def __init__(self, dat=0):
 		self.dat = dat
diff --git a/lib/sata/link/test/common.py b/lib/sata/test/common.py
similarity index 100%
rename from lib/sata/link/test/common.py
rename to lib/sata/test/common.py
diff --git a/lib/sata/link/test/crc.c b/lib/sata/test/crc.c
similarity index 100%
rename from lib/sata/link/test/crc.c
rename to lib/sata/test/crc.c
diff --git a/lib/sata/link/test/crc_tb.py b/lib/sata/test/crc_tb.py
similarity index 97%
rename from lib/sata/link/test/crc_tb.py
rename to lib/sata/test/crc_tb.py
index a4bd51bb7..0ce17dcac 100644
--- a/lib/sata/link/test/crc_tb.py
+++ b/lib/sata/test/crc_tb.py
@@ -4,7 +4,8 @@ from migen.fhdl.std import *
 
 from lib.sata.std import *
 from lib.sata.link.crc import *
-from lib.sata.link.test.common import *
+
+from lib.sata.test.common import *
 
 class TB(Module):
 	def __init__(self, length, random):
diff --git a/lib/sata/link/test/link_tb.py b/lib/sata/test/link_tb.py
similarity index 97%
rename from lib/sata/link/test/link_tb.py
rename to lib/sata/test/link_tb.py
index 5a7d4aa9c..3260034fe 100644
--- a/lib/sata/link/test/link_tb.py
+++ b/lib/sata/test/link_tb.py
@@ -7,8 +7,8 @@ from migen.sim.generic import run_simulation
 from lib.sata.std import *
 from lib.sata.link import SATALinkLayer
 
-from lib.sata.link.test.bfm import *
-from lib.sata.link.test.common import *
+from lib.sata.test.bfm import *
+from lib.sata.test.common import *
 
 class LinkPacket():
 	def __init__(self, d=[]):
diff --git a/lib/sata/link/test/scrambler.c b/lib/sata/test/scrambler.c
similarity index 100%
rename from lib/sata/link/test/scrambler.c
rename to lib/sata/test/scrambler.c
diff --git a/lib/sata/link/test/scrambler_tb.py b/lib/sata/test/scrambler_tb.py
similarity index 96%
rename from lib/sata/link/test/scrambler_tb.py
rename to lib/sata/test/scrambler_tb.py
index 9f2ad8d69..3100dc9fb 100644
--- a/lib/sata/link/test/scrambler_tb.py
+++ b/lib/sata/test/scrambler_tb.py
@@ -4,7 +4,8 @@ from migen.fhdl.std import *
 
 from lib.sata.std import *
 from lib.sata.link.scrambler import *
-from lib.sata.link.test.common import *
+
+from lib.sata.test.common import *
 
 class TB(Module):
 	def __init__(self, length):