diff --git a/src/androidTest/java/de/blau/android/gpx/GpxUploadTest.java b/src/androidTest/java/de/blau/android/gpx/GpxUploadTest.java
index 17a16056f2..ec79963f4e 100644
--- a/src/androidTest/java/de/blau/android/gpx/GpxUploadTest.java
+++ b/src/androidTest/java/de/blau/android/gpx/GpxUploadTest.java
@@ -1,9 +1,11 @@
 package de.blau.android.gpx;
 
+import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
+import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.IOException;
 
@@ -137,10 +139,30 @@ public void uploadGpx() {
                 assertTrue(TestUtils.clickText(device, false, main.getString(R.string.Done), true, false));
                 UiObject2 menuButton = TestUtils.getLayerButton(device, GPX_FILE, LayerDialogTest.MENU_BUTTON);
                 menuButton.click();
+                assertTrue(TestUtils.clickText(device, false, main.getString(R.string.menu_information), true, false));
+                assertTrue(TestUtils.findText(device, false, "112", 500, true));
+                assertTrue(TestUtils.findText(device, false, "79", 500, true));
+                assertTrue(TestUtils.clickText(device, false, main.getString(R.string.Done), true, false));
+                assertTrue(TestUtils.clickText(device, false, main.getString(R.string.Done), true, false));
+                menuButton = TestUtils.getLayerButton(device, GPX_FILE, LayerDialogTest.MENU_BUTTON);
+                menuButton.click();
                 assertTrue(TestUtils.clickText(device, false, main.getString(R.string.menu_gps_upload), true, false));
+                mockServer.enqueue("userdetails");
                 mockServer.enqueue("200");
                 assertTrue(TestUtils.clickResource(device, false, "android:id/button1", true));
                 assertTrue(TestUtils.textGone(device, "Uploading", 5000));
+
+                try {
+                    mockServer.takeRequest();
+                    String upload = mockServer.takeRequest().getUtf8Body();
+                    int gpxStart = upload.indexOf("<?xml");
+                    Track track = new Track(main, false);
+                    track.importFromGPX(new ByteArrayInputStream(upload.substring(gpxStart).getBytes()));
+                    assertEquals(79, track.getWayPoints().size());
+                    assertEquals(112, track.getTrackPoints().size());
+                } catch (InterruptedException e) {
+                    fail(e.getMessage());
+                }
             } finally {
                 TestUtils.deleteFile(main, GPX_FILE);
             }
diff --git a/src/main/java/de/blau/android/gpx/Track.java b/src/main/java/de/blau/android/gpx/Track.java
index f559c82204..565d139681 100755
--- a/src/main/java/de/blau/android/gpx/Track.java
+++ b/src/main/java/de/blau/android/gpx/Track.java
@@ -456,11 +456,11 @@ public void markNewSegment() {
      * 
      * @param outputStream the stream we are writing to
      * @throws XmlPullParserException
-     * @throws IOException
+     * @throws IOException if writing to the stream fails
      * @throws IllegalStateException
      * @throws IllegalArgumentException
      */
-    public void exportToGPX(@NonNull OutputStream outputStream) throws XmlPullParserException, IllegalArgumentException, IllegalStateException, IOException {
+    public void exportToGPX(@NonNull OutputStream outputStream) throws XmlPullParserException, IOException {
         XmlSerializer serializer = XmlPullParserFactory.newInstance().newSerializer();
         serializer.setOutput(outputStream, OsmXml.UTF_8);
         serializer.startDocument(OsmXml.UTF_8, null);
@@ -471,6 +471,9 @@ public void exportToGPX(@NonNull OutputStream outputStream) throws XmlPullParser
         serializer.attribute(null, "xsi:schemaLocation", "http://www.topografix.com/GPX/1/0 http://www.topografix.com/GPX/1/0/gpx.xsd");
         serializer.attribute(null, "version", "1.0");
         serializer.attribute(null, "creator", "Vespucci");
+        for (WayPoint wt : getWayPoints()) {
+            wt.toXml(serializer, this);
+        }
         serializer.startTag(null, TRK_ELEMENT);
         serializer.startTag(null, TRKSEG_ELEMENT);
         boolean hasPoints = false;