diff --git a/runtime-testsuite/test/org/antlr/v4/test/runtime/java/api/TestTokenStream.java b/runtime-testsuite/test/org/antlr/v4/test/runtime/java/api/TestTokenStream.java
new file mode 100644
index 000000000..b79ad1ccb
--- /dev/null
+++ b/runtime-testsuite/test/org/antlr/v4/test/runtime/java/api/TestTokenStream.java
@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2012-2016 The ANTLR Project. All rights reserved.
+ * Use of this file is governed by the BSD 3-clause license that
+ * can be found in the LICENSE.txt file in the project root.
+ */
+package org.antlr.v4.test.runtime.java.api;
+
+import org.antlr.v4.runtime.ANTLRInputStream;
+import org.antlr.v4.runtime.BufferedTokenStream;
+import org.antlr.v4.runtime.CharStream;
+import org.antlr.v4.runtime.Token;
+import org.antlr.v4.runtime.TokenStream;
+import org.junit.Assert;
+import org.junit.Test;
+
+/**
+ * This class contains tests for specific API functionality in {@link TokenStream} and derived types.
+ */
+public class TestTokenStream {
+
+	/**
+	 * This is a targeted regression test for antlr/antlr4#1584 ({@link BufferedTokenStream} cannot be reused after EOF).
+	 */
+	@Test
+	public void testBufferedTokenStreamReuseAfterFill() {
+		CharStream firstInput = new ANTLRInputStream("A");
+		BufferedTokenStream tokenStream = new BufferedTokenStream(new VisitorBasicLexer(firstInput));
+		tokenStream.fill();
+		Assert.assertEquals(2, tokenStream.size());
+		Assert.assertEquals(VisitorBasicLexer.A, tokenStream.get(0).getType());
+		Assert.assertEquals(Token.EOF, tokenStream.get(1).getType());
+
+		CharStream secondInput = new ANTLRInputStream("AA");
+		tokenStream.setTokenSource(new VisitorBasicLexer(secondInput));
+		tokenStream.fill();
+		Assert.assertEquals(3, tokenStream.size());
+		Assert.assertEquals(VisitorBasicLexer.A, tokenStream.get(0).getType());
+		Assert.assertEquals(VisitorBasicLexer.A, tokenStream.get(1).getType());
+		Assert.assertEquals(Token.EOF, tokenStream.get(2).getType());
+	}
+
+}
diff --git a/runtime-testsuite/test/org/antlr/v4/test/runtime/java/api/VisitorBasic.g4 b/runtime-testsuite/test/org/antlr/v4/test/runtime/java/api/VisitorBasic.g4
index cf739ec98..b1e67b308 100644
--- a/runtime-testsuite/test/org/antlr/v4/test/runtime/java/api/VisitorBasic.g4
+++ b/runtime-testsuite/test/org/antlr/v4/test/runtime/java/api/VisitorBasic.g4
@@ -3,3 +3,5 @@ grammar VisitorBasic;
 s
 	:	'A' EOF
 	;
+
+A : 'A';
diff --git a/runtime/Java/src/org/antlr/v4/runtime/BufferedTokenStream.java b/runtime/Java/src/org/antlr/v4/runtime/BufferedTokenStream.java
index 3745438bf..c0e5e89d4 100644
--- a/runtime/Java/src/org/antlr/v4/runtime/BufferedTokenStream.java
+++ b/runtime/Java/src/org/antlr/v4/runtime/BufferedTokenStream.java
@@ -252,6 +252,7 @@ public class BufferedTokenStream implements TokenStream {
         this.tokenSource = tokenSource;
         tokens.clear();
         p = -1;
+        fetchedEOF = false;
     }
 
     public List<Token> getTokens() { return tokens; }