diff --git a/trie/node_test.go b/trie/node_test.go
new file mode 100644
index 0000000000..52720f1c77
--- /dev/null
+++ b/trie/node_test.go
@@ -0,0 +1,94 @@
+// Copyright 2019 The go-ethereum Authors
+// This file is part of the go-ethereum library.
+//
+// The go-ethereum library is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Lesser General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// The go-ethereum library is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU Lesser General Public License for more details.
+//
+// You should have received a copy of the GNU Lesser General Public License
+// along with the go-ethereum library. If not, see <http://www.gnu.org/licenses/>.
+
+package trie
+
+import (
+	"bytes"
+	"testing"
+
+	"github.com/ethereum/go-ethereum/rlp"
+)
+
+func newTestFullNode(v []byte) []interface{} {
+	fullNodeData := []interface{}{}
+	for i := 0; i < 16; i++ {
+		k := bytes.Repeat([]byte{byte(i + 1)}, 32)
+		fullNodeData = append(fullNodeData, k)
+	}
+	fullNodeData = append(fullNodeData, v)
+	return fullNodeData
+}
+
+func TestDecodeNestedNode(t *testing.T) {
+	fullNodeData := newTestFullNode([]byte("fullnode"))
+
+	data := [][]byte{}
+	for i := 0; i < 16; i++ {
+		data = append(data, nil)
+	}
+	data = append(data, []byte("subnode"))
+	fullNodeData[15] = data
+
+	buf := bytes.NewBuffer([]byte{})
+	rlp.Encode(buf, fullNodeData)
+
+	if _, err := decodeNode([]byte("testdecode"), buf.Bytes()); err != nil {
+		t.Fatalf("decode nested full node err: %v", err)
+	}
+}
+
+func TestDecodeFullNodeWrongSizeChild(t *testing.T) {
+	fullNodeData := newTestFullNode([]byte("wrongsizechild"))
+	fullNodeData[0] = []byte("00")
+	buf := bytes.NewBuffer([]byte{})
+	rlp.Encode(buf, fullNodeData)
+
+	_, err := decodeNode([]byte("testdecode"), buf.Bytes())
+	if _, ok := err.(*decodeError); !ok {
+		t.Fatalf("decodeNode returned wrong err: %v", err)
+	}
+}
+
+func TestDecodeFullNodeWrongNestedFullNode(t *testing.T) {
+	fullNodeData := newTestFullNode([]byte("fullnode"))
+
+	data := [][]byte{}
+	for i := 0; i < 16; i++ {
+		data = append(data, []byte("123456"))
+	}
+	data = append(data, []byte("subnode"))
+	fullNodeData[15] = data
+
+	buf := bytes.NewBuffer([]byte{})
+	rlp.Encode(buf, fullNodeData)
+
+	_, err := decodeNode([]byte("testdecode"), buf.Bytes())
+	if _, ok := err.(*decodeError); !ok {
+		t.Fatalf("decodeNode returned wrong err: %v", err)
+	}
+}
+
+func TestDecodeFullNode(t *testing.T) {
+	fullNodeData := newTestFullNode([]byte("decodefullnode"))
+	buf := bytes.NewBuffer([]byte{})
+	rlp.Encode(buf, fullNodeData)
+
+	_, err := decodeNode([]byte("testdecode"), buf.Bytes())
+	if err != nil {
+		t.Fatalf("decode full node err: %v", err)
+	}
+}