diff --git a/src/se/vidstige/jadb/RemoteFile.java b/src/se/vidstige/jadb/RemoteFile.java
index a422321..48ef23c 100644
--- a/src/se/vidstige/jadb/RemoteFile.java
+++ b/src/se/vidstige/jadb/RemoteFile.java
@@ -10,7 +10,7 @@ public class RemoteFile {
 
     public String getName() { throw new UnsupportedOperationException(); }
     public int getSize() { throw new UnsupportedOperationException(); }
-    public long getLastModified() { throw new UnsupportedOperationException(); }
+    public int getLastModified() { throw new UnsupportedOperationException(); }
     public boolean isDirectory() { throw new UnsupportedOperationException(); }
 
     public String getPath() { return path;}
diff --git a/src/se/vidstige/jadb/RemoteFileRecord.java b/src/se/vidstige/jadb/RemoteFileRecord.java
index 81a3027..b3752c2 100644
--- a/src/se/vidstige/jadb/RemoteFileRecord.java
+++ b/src/se/vidstige/jadb/RemoteFileRecord.java
@@ -8,9 +8,9 @@ class RemoteFileRecord extends RemoteFile {
 
     private final int mode;
     private final int size;
-    private final long lastModified;
+    private final int lastModified;
 
-    public RemoteFileRecord(String name, int mode, int size, long lastModified) {
+    public RemoteFileRecord(String name, int mode, int size, int lastModified) {
         super(name);
         this.mode = mode;
         this.size = size;
@@ -23,7 +23,7 @@ class RemoteFileRecord extends RemoteFile {
     }
 
     @Override
-    public long getLastModified() {
+    public int getLastModified() {
         return lastModified;
     }
 
diff --git a/src/se/vidstige/jadb/SyncTransport.java b/src/se/vidstige/jadb/SyncTransport.java
index f06d242..8b62a7a 100644
--- a/src/se/vidstige/jadb/SyncTransport.java
+++ b/src/se/vidstige/jadb/SyncTransport.java
@@ -55,7 +55,7 @@ public class SyncTransport {
         output.writeBytes("DENT");
         output.writeInt(Integer.reverseBytes(0666 | (file.isDirectory() ? (1 << 14) : 0)));
         output.writeInt(Integer.reverseBytes(file.getSize()));
-        output.writeInt(Integer.reverseBytes((int)file.getLastModified()));
+        output.writeInt(Integer.reverseBytes(file.getLastModified()));
         byte[] pathChars = file.getPath().getBytes(StandardCharsets.UTF_8);
         output.writeInt(Integer.reverseBytes(pathChars.length));
         output.write(pathChars);
diff --git a/test/se/vidstige/jadb/test/fakes/FakeAdbServer.java b/test/se/vidstige/jadb/test/fakes/FakeAdbServer.java
index c94ebeb..48fb444 100644
--- a/test/se/vidstige/jadb/test/fakes/FakeAdbServer.java
+++ b/test/se/vidstige/jadb/test/fakes/FakeAdbServer.java
@@ -269,12 +269,12 @@ public class FakeAdbServer implements AdbResponder {
                 return remotePath.equals(this.remotePath);
             }
 
-            public ListExpectation withFile(String path, int size, long modifyTime) {
+            public ListExpectation withFile(String path, int size, int modifyTime) {
                 files.add(new MockFileEntry(path, size, modifyTime, false));
                 return this;
             }
 
-            public ListExpectation withDir(String path, long modifyTime) {
+            public ListExpectation withDir(String path, int modifyTime) {
                 files.add(new MockFileEntry(path, -1, modifyTime, true));
                 return this;
             }
@@ -286,10 +286,10 @@ public class FakeAdbServer implements AdbResponder {
             private static class MockFileEntry extends RemoteFile {
 
                 private final int size;
-                private final long modifyTime;
+                private final int modifyTime;
                 private final boolean dir;
 
-                MockFileEntry(String path, int size, long modifyTime, boolean dir) {
+                MockFileEntry(String path, int size, int modifyTime, boolean dir) {
                     super(path);
                     this.size = size;
                     this.modifyTime = modifyTime;
@@ -300,7 +300,7 @@ public class FakeAdbServer implements AdbResponder {
                     return size;
                 }
 
-                public long getLastModified() {
+                public int getLastModified() {
                     return modifyTime;
                 }
 
diff --git a/test/se/vidstige/jadb/test/unit/MockedTestCases.java b/test/se/vidstige/jadb/test/unit/MockedTestCases.java
index 90e224f..87ec980 100644
--- a/test/se/vidstige/jadb/test/unit/MockedTestCases.java
+++ b/test/se/vidstige/jadb/test/unit/MockedTestCases.java
@@ -130,21 +130,21 @@ public class MockedTestCases {
     public void testFileList() throws Exception {
         server.add("serial-123");
         server.expectList("serial-123", "/sdcard/Documents")
-                .withDir("school", 123456789L)
-                .withDir("finances", 7070707L)
-                .withDir("\u904A\u6232", 528491L)
-                .withFile("user_manual.pdf", 3000, 648649L)
-                .withFile("effective java vol. 7.epub", 0xCAFE, 0xBABEL)
-                .withFile("\uB9AC\uADF8 \uC624\uBE0C \uB808\uC804\uB4DC", 240, 9001L);
+                .withDir("school", 123456789)
+                .withDir("finances", 7070707)
+                .withDir("\u904A\u6232", 528491)
+                .withFile("user_manual.pdf", 3000, 648649)
+                .withFile("effective java vol. 7.epub", 0xCAFE, 0xBABE)
+                .withFile("\uB9AC\uADF8 \uC624\uBE0C \uB808\uC804\uB4DC", 240, 9001);
         JadbDevice device = connection.getDevices().get(0);
         List<RemoteFile> files = device.list("/sdcard/Documents");
         Assert.assertEquals(6, files.size());
-        assertHasDir("school", 123456789L, files);
-        assertHasDir("finances", 7070707L, files);
-        assertHasDir("\u904A\u6232", 528491L, files);
-        assertHasFile("user_manual.pdf", 3000, 648649L, files);
-        assertHasFile("effective java vol. 7.epub", 0xCAFE, 0xBABEL, files);
-        assertHasFile("\uB9AC\uADF8 \uC624\uBE0C \uB808\uC804\uB4DC", 240, 9001L, files);
+        assertHasDir("school", 123456789, files);
+        assertHasDir("finances", 7070707, files);
+        assertHasDir("\u904A\u6232", 528491, files);
+        assertHasFile("user_manual.pdf", 3000, 648649, files);
+        assertHasFile("effective java vol. 7.epub", 0xCAFE, 0xBABE, files);
+        assertHasFile("\uB9AC\uADF8 \uC624\uBE0C \uB808\uC804\uB4DC", 240, 9001, files);
     }
 
     private static long parseDate(String date) throws ParseException {