diff --git a/library/src/androidTest/assets/ts/sample.ps b/library/src/androidTest/assets/ts/sample.ps
new file mode 100644
index 0000000000..f7a2d96db5
Binary files /dev/null and b/library/src/androidTest/assets/ts/sample.ps differ
diff --git a/library/src/androidTest/assets/ts/sample.ps.dump b/library/src/androidTest/assets/ts/sample.ps.dump
new file mode 100644
index 0000000000..7e970a4a60
--- /dev/null
+++ b/library/src/androidTest/assets/ts/sample.ps.dump
@@ -0,0 +1,79 @@
+seekMap:
+  isSeekable = false
+  duration = UNSET TIME
+  getPosition(0) = 0
+numberOfTracks = 2
+track 192:
+  format:
+    bitrate = -1
+    id = null
+    containerMimeType = null
+    sampleMimeType = audio/mpeg-L2
+    maxInputSize = 4096
+    requiresSecureDecryption = false
+    width = -1
+    height = -1
+    frameRate = -1.0
+    rotationDegrees = -1
+    pixelWidthHeightRatio = -1.0
+    channelCount = 1
+    sampleRate = 44100
+    pcmEncoding = -1
+    encoderDelay = -1
+    encoderPadding = -1
+    subsampleOffsetUs = 9223372036854775807
+    selectionFlags = 0
+    language = null
+    drmInitData = -
+    initializationData:
+  sample count = 4
+  sample 0:
+    time = 29088
+    flags = 1
+    data = length 417, hash 5C710F78
+  sample 1:
+    time = 55210
+    flags = 1
+    data = length 418, hash 79CF71F8
+  sample 2:
+    time = 81332
+    flags = 1
+    data = length 418, hash 79CF71F8
+  sample 3:
+    time = 107454
+    flags = 1
+    data = length 418, hash 79CF71F8
+track 224:
+  format:
+    bitrate = -1
+    id = null
+    containerMimeType = null
+    sampleMimeType = video/mpeg2
+    maxInputSize = -1
+    requiresSecureDecryption = false
+    width = 640
+    height = 426
+    frameRate = -1.0
+    rotationDegrees = -1
+    pixelWidthHeightRatio = 1.0
+    channelCount = -1
+    sampleRate = -1
+    pcmEncoding = -1
+    encoderDelay = -1
+    encoderPadding = -1
+    subsampleOffsetUs = 9223372036854775807
+    selectionFlags = 0
+    language = null
+    drmInitData = -
+    initializationData:
+      data = length 22, hash 743CC6F8
+  sample count = 2
+  sample 0:
+    time = 40000
+    flags = 1
+    data = length 20616, hash CA38A5B5
+  sample 1:
+    time = 80000
+    flags = 0
+    data = length 17831, hash 5C5A57F5
+tracksEnded = true
diff --git a/library/src/androidTest/assets/ts/sample.mpeg b/library/src/androidTest/assets/ts/sample.ts
similarity index 100%
rename from library/src/androidTest/assets/ts/sample.mpeg
rename to library/src/androidTest/assets/ts/sample.ts
diff --git a/library/src/androidTest/assets/ts/sample.mpeg.dump b/library/src/androidTest/assets/ts/sample.ts.dump
similarity index 100%
rename from library/src/androidTest/assets/ts/sample.mpeg.dump
rename to library/src/androidTest/assets/ts/sample.ts.dump
diff --git a/library/src/androidTest/java/com/google/android/exoplayer/extractor/ts/PsExtractorTest.java b/library/src/androidTest/java/com/google/android/exoplayer/extractor/ts/PsExtractorTest.java
new file mode 100644
index 0000000000..634c0f0354
--- /dev/null
+++ b/library/src/androidTest/java/com/google/android/exoplayer/extractor/ts/PsExtractorTest.java
@@ -0,0 +1,37 @@
+/*
+ * Copyright (C) 2016 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.google.android.exoplayer.extractor.ts;
+
+import com.google.android.exoplayer.extractor.Extractor;
+import com.google.android.exoplayer.testutil.TestUtil;
+
+import android.test.InstrumentationTestCase;
+
+/**
+ * Unit test for {@link PsExtractor}.
+ */
+public final class PsExtractorTest extends InstrumentationTestCase {
+
+  public void testSample() throws Exception {
+    TestUtil.assertOutput(new TestUtil.ExtractorFactory() {
+      @Override
+      public Extractor create() {
+        return new PsExtractor();
+      }
+    }, "ts/sample.ps", getInstrumentation());
+  }
+
+}
diff --git a/library/src/androidTest/java/com/google/android/exoplayer/extractor/ts/TsExtractorTest.java b/library/src/androidTest/java/com/google/android/exoplayer/extractor/ts/TsExtractorTest.java
index f49c3d49e1..85f4cc1a91 100644
--- a/library/src/androidTest/java/com/google/android/exoplayer/extractor/ts/TsExtractorTest.java
+++ b/library/src/androidTest/java/com/google/android/exoplayer/extractor/ts/TsExtractorTest.java
@@ -31,7 +31,7 @@ public final class TsExtractorTest extends InstrumentationTestCase {
       public Extractor create() {
         return new TsExtractor();
       }
-    }, "ts/sample.mpeg", getInstrumentation());
+    }, "ts/sample.ts", getInstrumentation());
   }
 
 }