diff --git a/liteeth/mac/__init__.py b/liteeth/mac/__init__.py
index 7fd7af69a..7676f38a4 100644
--- a/liteeth/mac/__init__.py
+++ b/liteeth/mac/__init__.py
@@ -10,7 +10,11 @@ class LiteEthMAC(Module, AutoCSR):
 		if interface == "core":
 			self.sink, self.source = self.core.sink, self.core.source
 		elif interface == "wishbone":
-			self.interface = wishbone.LiteEthMACWishboneInterface(dw, 2, 2)
+			self.submodules.interface = wishbone.LiteEthMACWishboneInterface(dw, 2, 2)
+			self.comb += [
+				Record.connect(self.interface.source, self.core.sink),
+				Record.connect(self.core.source, self.interface.sink)
+			]
 			self.ev, self.bus = self.interface.sram.ev, self.interface.bus
 			self.csrs = self.interface.get_csrs()
 		elif interface == "dma":
diff --git a/liteeth/test/mac_wishbone_tb.py b/liteeth/test/mac_wishbone_tb.py
index 1e4dbf1fe..6e7462418 100644
--- a/liteeth/test/mac_wishbone_tb.py
+++ b/liteeth/test/mac_wishbone_tb.py
@@ -3,10 +3,11 @@ from migen.bus import wishbone
 from migen.bus.transactions import *
 from migen.sim.generic import run_simulation
 
-from misoclib.ethmac import EthMAC
-from misoclib.ethmac.phy import loopback
+from liteeth.common import *
+from liteeth.mac import LiteEthMAC
 
-from misoclib.ethmac.test.common import *
+from liteeth.test.common import *
+from liteeth.test.model import phy, mac
 
 class WishboneMaster:
 	def __init__(self, obj):
@@ -62,10 +63,25 @@ class SRAMReaderDriver:
 		self.obj.ev.done.clear = 0
 		yield
 
+class SRAMWriterDriver:
+	def __init__(self, obj):
+		self.obj = obj
+
+	def wait_available(self):
+		while self.obj.ev.available.pending == 0:
+			yield
+
+	def clear_available(self):
+		self.obj.ev.available.clear = 1
+		yield
+		self.obj.ev.available.clear = 0
+		yield
+
 class TB(Module):
 	def __init__(self):
-		self.submodules.ethphy = loopback.LoopbackPHY()
-		self.submodules.ethmac = EthMAC(phy=self.ethphy, with_hw_preamble_crc=True)
+		self.submodules.phy_model = phy.PHY(8, debug=False)
+		self.submodules.mac_model = mac.MAC(self.phy_model, debug=False, loopback=True)
+		self.submodules.ethmac = LiteEthMAC(phy=self.phy_model, dw=32, interface="wishbone", with_hw_preamble_crc=True)
 
 		# use sys_clk for each clock_domain
 		self.clock_domains.cd_eth_rx = ClockDomain()
@@ -85,39 +101,45 @@ class TB(Module):
 		selfp.cd_eth_tx.rst = 0
 
 		wishbone_master = WishboneMaster(selfp.ethmac.bus)
-		sram_reader_driver = SRAMReaderDriver(selfp.ethmac.sram_reader)
+		sram_reader_driver = SRAMReaderDriver(selfp.ethmac.interface.sram.reader)
+		sram_writer_driver = SRAMWriterDriver(selfp.ethmac.interface.sram.writer)
 
 		sram_writer_slots_offset = [0x000, 0x200]
 		sram_reader_slots_offset = [0x400, 0x600]
 
-		length = 1500+2
+		length = 150+2
 
 		tx_payload = [seed_to_data(i, True) % 0xFF for i in range(length)] + [0, 0, 0, 0]
 
 		errors = 0
 
-		for slot in range(2):
-			print("slot {}:".format(slot))
-			# fill tx memory
-			for i in range(length//4+1):
-				dat = int.from_bytes(tx_payload[4*i:4*(i+1)], "big")
-				yield from wishbone_master.write(sram_reader_slots_offset[slot]+i, dat)
+		while True:
+			for slot in range(2):
+				print("slot {}:".format(slot))
+				# fill tx memory
+				for i in range(length//4+1):
+					dat = int.from_bytes(tx_payload[4*i:4*(i+1)], "big")
+					yield from wishbone_master.write(sram_reader_slots_offset[slot]+i, dat)
 
-			# send tx payload & wait
-			yield from sram_reader_driver.start(slot, length)
-			yield from sram_reader_driver.wait_done()
-			yield from sram_reader_driver.clear_done()
+				# send tx payload & wait
+				yield from sram_reader_driver.start(slot, length)
+				yield from sram_reader_driver.wait_done()
+				yield from sram_reader_driver.clear_done()
 
-			# get rx payload (loopback on PHY Model)
-			rx_payload = []
-			for i in range(length//4+1):
-				yield from wishbone_master.read(sram_writer_slots_offset[slot]+i)
-				dat = wishbone_master.dat
-				rx_payload += list(dat.to_bytes(4, byteorder='big'))
+				# wait rx
+				yield from sram_writer_driver.wait_available()
+				yield from sram_writer_driver.clear_available()
 
-			# check results
-			s, l, e = check(tx_payload[:length], rx_payload[:min(length, len(rx_payload))])
-			print("shift "+ str(s) + " / length " + str(l) + " / errors " + str(e))
+				# get rx payload (loopback on PHY Model)
+				rx_payload = []
+				for i in range(length//4+1):
+					yield from wishbone_master.read(sram_writer_slots_offset[slot]+i)
+					dat = wishbone_master.dat
+					rx_payload += list(dat.to_bytes(4, byteorder='big'))
+
+				# check results
+				s, l, e = check(tx_payload[:length], rx_payload[:min(length, len(rx_payload))])
+				print("shift "+ str(s) + " / length " + str(l) + " / errors " + str(e))
 
 if __name__ == "__main__":
-	run_simulation(TB(), vcd_name="my.vcd")
+	run_simulation(TB(), ncycles=3000, vcd_name="my.vcd", keep_files=True)