Index: tests/phpunit/data/uploads/test.csv
===================================================================
--- tests/phpunit/data/uploads/test.csv	(nonexistent)
+++ tests/phpunit/data/uploads/test.csv	(working copy)
@@ -0,0 +1,4 @@
+"country","country group","name (en)","name (fr)","name (de)","latitude","longitude"
+"at","eu","Austria","Autriche","Österreich","47.6965545","13.34598005"
+"be","eu","Belgium","Belgique","Belgien","50.501045","4.47667405"
+"bg","eu","Bulgaria","Bulgarie","Bulgarien","42.72567375","25.4823218"
\ No newline at end of file
Index: tests/phpunit/data/uploads/test.dfxp
===================================================================
--- tests/phpunit/data/uploads/test.dfxp	(nonexistent)
+++ tests/phpunit/data/uploads/test.dfxp	(working copy)
@@ -0,0 +1,8 @@
+<tt xml:lang="" xmlns="http://www.w3.org/2006/04/ttaf1">
+  <head>
+    <metadata/>
+    <styling/>
+    <layout/>
+  </head>
+  <body/>
+</tt>
\ No newline at end of file
Index: tests/phpunit/data/uploads/test.tsv
===================================================================
--- tests/phpunit/data/uploads/test.tsv	(nonexistent)
+++ tests/phpunit/data/uploads/test.tsv	(working copy)
@@ -0,0 +1,3 @@
+sample	tsv	file	1
+some	text	here	2
+yup	it's	text	3
\ No newline at end of file
Index: tests/phpunit/data/uploads/test.vtt
===================================================================
--- tests/phpunit/data/uploads/test.vtt	(nonexistent)
+++ tests/phpunit/data/uploads/test.vtt	(working copy)
@@ -0,0 +1,40 @@
+WEBVTT
+
+00:11.000 --> 00:13.000
+<v Roger Bingham>We are in New York City
+
+00:13.000 --> 00:16.000
+<v Roger Bingham>We’re actually at the Lucern Hotel, just down the street
+
+00:16.000 --> 00:18.000
+<v Roger Bingham>from the American Museum of Natural History
+
+00:18.000 --> 00:20.000
+<v Roger Bingham>And with me is Neil deGrasse Tyson
+
+00:20.000 --> 00:22.000
+<v Roger Bingham>Astrophysicist, Director of the Hayden Planetarium
+
+00:22.000 --> 00:24.000
+<v Roger Bingham>at the AMNH.
+
+00:24.000 --> 00:26.000
+<v Roger Bingham>Thank you for walking down here.
+
+00:27.000 --> 00:30.000
+<v Roger Bingham>And I want to do a follow-up on the last conversation we did.
+
+00:30.000 --> 00:31.500 align:right size:50%
+<v Roger Bingham>When we e-mailed—
+
+00:30.500 --> 00:32.500 align:left size:50%
+<v Neil deGrasse Tyson>Didn’t we talk about enough in that conversation?
+
+00:32.000 --> 00:35.500 align:right size:50%
+<v Roger Bingham>No! No no no no; 'cos 'cos obviously 'cos
+
+00:32.500 --> 00:33.500 align:left size:50%
+<v Neil deGrasse Tyson><i>Laughs</i>
+
+00:35.500 --> 00:38.000
+<v Roger Bingham>You know I’m so excited my glasses are falling off here.
\ No newline at end of file
Index: tests/phpunit/tests/functions.php
===================================================================
--- tests/phpunit/tests/functions.php	(revision 44356)
+++ tests/phpunit/tests/functions.php	(working copy)
@@ -1150,6 +1150,54 @@
 					'proper_filename' => false,
 				),
 			),
+			// Non-image file not allowed even if it's named like one.
+			array(
+				DIR_TESTDATA . '/export/crazy-cdata.xml',
+				'crazy-cdata.jpg',
+				array(
+					'ext' => false,
+					'type' => false,
+					'proper_filename' => false,
+				),
+			),
+			// Non-image file not allowed if it's named like something else.
+			array(
+				DIR_TESTDATA . '/export/crazy-cdata.xml',
+				'crazy-cdata.doc',
+				array(
+					'ext' => false,
+					'type' => false,
+					'proper_filename' => false,
+				),
+			),
+			// Assorted text/* sample files
+			array(
+				DIR_TESTDATA . '/uploads/test.vtt',
+				'test.vtt',
+				array(
+					'ext' => 'vtt',
+					'type' => 'text/vtt',
+					'proper_filename' => false,
+				),
+			),
+			array(
+				DIR_TESTDATA . '/uploads/test.dfxp',
+				'test.dfxp',
+				array(
+					'ext' => 'dfxp',
+					'type' => 'text/dfxp',
+					'proper_filename' => false,
+				),
+			),
+			array(
+				DIR_TESTDATA . '/uploads/test.csv',
+				'test.csv',
+				array(
+					'ext' => 'csv',
+					'type' => 'text/csv',
+					'proper_filename' => false,
+				),
+			),
 		);
 
 		// Test a few additional file types on single sites.
