diff --git a/chrome/content/zotero/xpcom/fulltext.js b/chrome/content/zotero/xpcom/fulltext.js
index 8fbc26ba2..8cfa71843 100644
--- a/chrome/content/zotero/xpcom/fulltext.js
+++ b/chrome/content/zotero/xpcom/fulltext.js
@@ -549,6 +549,9 @@ Zotero.Fulltext = Zotero.FullText = new function(){
 		}
 		
 		var maxLength = Zotero.Prefs.get('fulltext.textMaxLength');
+		if (!maxLength) {
+			return false;
+		}
 		var obj = yield convertItemHTMLToText(itemID, document.body.innerHTML, maxLength);
 		var text = obj.text;
 		var totalChars = obj.totalChars;
@@ -596,12 +599,17 @@ Zotero.Fulltext = Zotero.FullText = new function(){
 			return false;
 		}
 		
-		Zotero.debug('Indexing file ' + path);
+		var maxLength = Zotero.Prefs.get('fulltext.textMaxLength');
+		if (!maxLength) {
+			return false;
+		}
+		if (complete) {
+			maxLength = null;
+		}
 		
+		Zotero.debug('Indexing file ' + path);
 		var text = yield Zotero.File.getContentsAsync(path, charset);
 		var totalChars = text.length;
-		var maxLength = complete ? false : Zotero.Prefs.get('fulltext.textMaxLength');
-		
 		if (contentType == 'text/html') {
 			let obj = yield convertItemHTMLToText(itemID, text, maxLength);
 			text = obj.text;
diff --git a/test/tests/fulltextTest.js b/test/tests/fulltextTest.js
index 2f6a0b845..1bfedeba0 100644
--- a/test/tests/fulltextTest.js
+++ b/test/tests/fulltextTest.js
@@ -1,10 +1,83 @@
 describe("Zotero.Fulltext", function () {
+	var win, pdfToolsVersion;
+	
+	before(function* () {
+		// Hidden browser, which requires a browser window, needed for charset detection
+		// (until we figure out a better way)
+		win = yield loadBrowserWindow();
+		
+		pdfToolsVersion = Zotero.isWin ? '3.02a' : '3.04';
+	});
+	after(function () {
+		if (win) {
+			win.close();
+		}
+	});
+	
+	describe("#indexItems()", function () {
+		before(function* () {
+			yield Zotero.Fulltext.downloadPDFTool('info', pdfToolsVersion);
+			yield Zotero.Fulltext.downloadPDFTool('converter', pdfToolsVersion);
+		});
+		
+		beforeEach(function () {
+			Zotero.Prefs.clear('fulltext.textMaxLength');
+			Zotero.Prefs.clear('fulltext.pdfMaxPages');
+		});
+		after(function () {
+			Zotero.Prefs.clear('fulltext.textMaxLength');
+			Zotero.Prefs.clear('fulltext.pdfMaxPages');
+		});
+		
+		it("should index a text file by default", function* () {
+			var item = yield importFileAttachment('test.txt');
+			assert.equal(
+				(yield Zotero.Fulltext.getIndexedState(item)),
+				Zotero.Fulltext.INDEX_STATE_INDEXED
+			);
+		})
+		
+		it("should skip indexing of a text file if fulltext.textMaxLength is 0", function* () {
+			Zotero.Prefs.set('fulltext.textMaxLength', 0);
+			var item = yield importFileAttachment('test.txt');
+			assert.equal(
+				(yield Zotero.Fulltext.getIndexedState(item)),
+				Zotero.Fulltext.INDEX_STATE_UNINDEXED
+			);
+		})
+		
+		it("should index a PDF by default", function* () {
+			var item = yield importFileAttachment('test.pdf');
+			assert.equal(
+				(yield Zotero.Fulltext.getIndexedState(item)),
+				Zotero.Fulltext.INDEX_STATE_INDEXED
+			);
+		})
+		
+		it("should skip indexing of a PDF if fulltext.textMaxLength is 0", function* () {
+			Zotero.Prefs.set('fulltext.textMaxLength', 0);
+			var item = yield importFileAttachment('test.pdf');
+			assert.equal(
+				(yield Zotero.Fulltext.getIndexedState(item)),
+				Zotero.Fulltext.INDEX_STATE_UNINDEXED
+			);
+		})
+		
+		it("should skip indexing of a PDF if fulltext.pdfMaxPages is 0", function* () {
+			Zotero.Prefs.set('fulltext.pdfMaxPages', 0);
+			var item = yield importFileAttachment('test.pdf');
+			assert.equal(
+				(yield Zotero.Fulltext.getIndexedState(item)),
+				Zotero.Fulltext.INDEX_STATE_UNINDEXED
+			);
+		})
+	})
+	
 	describe("#downloadPDFTool()", function () {
 		it("should install the PDF tools", function* () {
 			yield Zotero.Fulltext.uninstallPDFTools();
 			assert.isFalse(Zotero.Fulltext.pdfInfoIsRegistered());
 			
-			var version = Zotero.isWin ? '3.02a' : '3.04';
 			var dataDir = Zotero.getZoteroDirectory().path;
 			var execFileName = Zotero.Fulltext.pdfInfoFileName;
 			var execPath = OS.Path.join(dataDir, execFileName);
@@ -16,7 +89,7 @@ describe("Zotero.Fulltext", function () {
 				'resource://zotero/redirect.' + scriptExt
 			);
 			var cacheExecPath = OS.Path.join(
-				getTestDataDirectory().path, "pdf", version, execFileName
+				getTestDataDirectory().path, "pdf", pdfToolsVersion, execFileName
 			);
 			
 			// Delete existing files
@@ -33,7 +106,7 @@ describe("Zotero.Fulltext", function () {
 			}
 			catch (e) {}
 			
-			yield Zotero.Fulltext.downloadPDFTool('info', version);
+			yield Zotero.Fulltext.downloadPDFTool('info', pdfToolsVersion);
 			
 			assert.ok(Zotero.Fulltext.pdfInfoIsRegistered());
 			assert.equal(
@@ -45,7 +118,7 @@ describe("Zotero.Fulltext", function () {
 			}
 			assert.equal(
 				(yield Zotero.File.getContentsAsync(versionPath)),
-				version
+				pdfToolsVersion
 			);
 			
 			//Temp: disabled on Windows