diff --git a/eth/protocols/eth/peer_test.go b/eth/protocols/eth/peer_test.go
index cf531cee11..6297dbb51c 100644
--- a/eth/protocols/eth/peer_test.go
+++ b/eth/protocols/eth/peer_test.go
@@ -30,7 +30,6 @@ import (
 	"github.com/ethereum/go-ethereum/core/types"
 	"github.com/ethereum/go-ethereum/p2p"
 	"github.com/ethereum/go-ethereum/p2p/enode"
-	"github.com/ethereum/go-ethereum/p2p/tracker"
 	"github.com/ethereum/go-ethereum/params"
 	"github.com/ethereum/go-ethereum/rlp"
 )
@@ -188,11 +187,6 @@ func TestPartialReceipt(t *testing.T) {
 		}),
 	}
 
-	tresp := tracker.Response{ID: delivery.RequestId, MsgCode: ReceiptsMsg, Size: delivery.List.Len()}
-	if err := peer.tracker.Fulfil(tresp); err != nil {
-		t.Fatalf("Tracker failed: %v", err)
-	}
-
 	receiptList, _ := delivery.List.Items()
 	if err := peer.bufferReceipts(delivery.RequestId, receiptList, delivery.LastBlockIncomplete, backend); err != nil {
 		t.Fatalf("first bufferReceipts failed: %v", err)
@@ -226,10 +220,6 @@ func TestPartialReceipt(t *testing.T) {
 			},
 		}),
 	}
-	tresp = tracker.Response{ID: delivery.RequestId, MsgCode: ReceiptsMsg, Size: delivery.List.Len()}
-	if err := peer.tracker.Fulfil(tresp); err != nil {
-		t.Fatalf("Tracker failed: %v", err)
-	}
 	receiptLists, _ := delivery.List.Items()
 	if err := peer.bufferReceipts(delivery.RequestId, receiptLists, delivery.LastBlockIncomplete, backend); err != nil {
 		t.Fatalf("second bufferReceipts failed: %v", err)
@@ -271,11 +261,6 @@ func TestPartialReceipt(t *testing.T) {
 			},
 		}),
 	}
-
-	tresp = tracker.Response{ID: delivery.RequestId, MsgCode: ReceiptsMsg, Size: delivery.List.Len()}
-	if err := peer.tracker.Fulfil(tresp); err != nil {
-		t.Fatalf("Tracker failed: %v", err)
-	}
 	receiptList, _ = delivery.List.Items()
 	if err := peer.bufferReceipts(delivery.RequestId, receiptList, delivery.LastBlockIncomplete, backend); err != nil {
 		t.Fatalf("third bufferReceipts failed: %v", err)
@@ -358,11 +343,6 @@ func TestPartialReceiptFailure(t *testing.T) {
 			},
 		}),
 	}
-	tresp := tracker.Response{ID: delivery.RequestId, MsgCode: ReceiptsMsg, Size: delivery.List.Len()}
-	if err := peer.tracker.Fulfil(tresp); err == nil {
-		t.Fatal("Unknown response should be rejected by tracker")
-	}
-
 	// If a peer deliverse excessive amount of receipts, it should also fail the validation
 	hashes := []common.Hash{
 		backend.chain.GetBlockByNumber(1).Hash(),
@@ -407,10 +387,6 @@ func TestPartialReceiptFailure(t *testing.T) {
 			items: encodeRL(excessiveReceipts),
 		}}),
 	}
-	tresp = tracker.Response{ID: delivery.RequestId, MsgCode: ReceiptsMsg, Size: delivery.List.Len()}
-	if err = peer.tracker.Fulfil(tresp); err != nil {
-		t.Fatalf("tracker.Fulfil failed: %v", err)
-	}
 	receiptList, _ := delivery.List.Items()
 	err = peer.bufferReceipts(delivery.RequestId, receiptList, delivery.LastBlockIncomplete, backend)
 	if err == nil {
@@ -437,10 +413,6 @@ func TestPartialReceiptFailure(t *testing.T) {
 			}),
 		}}),
 	}
-	tresp = tracker.Response{ID: delivery.RequestId, MsgCode: ReceiptsMsg, Size: delivery.List.Len()}
-	if err = peer.tracker.Fulfil(tresp); err != nil {
-		t.Fatalf("tracker.Fulfil failed: %v", err)
-	}
 	receiptList, _ = delivery.List.Items()
 	err = peer.bufferReceipts(delivery.RequestId, receiptList, delivery.LastBlockIncomplete, backend)
 	if err == nil {