diff --git a/rowers/tests.py b/rowers/tests.py
index 8a5a4b7d..aa4666df 100644
--- a/rowers/tests.py
+++ b/rowers/tests.py
@@ -453,7 +453,7 @@ class ViewTest(TestCase):
 
         w = Workout.objects.get(id=1)
 	f_to_be_deleted = w.csvfilename
-	os.remove(f_to_be_deleted)
+	os.remove(f_to_be_deleted+'.gz')
 
 
     def test_upload_view_notloggedin(self):
@@ -501,7 +501,7 @@ class ViewTest(TestCase):
 	
 	w = Workout.objects.get(id=1)
 	f_to_be_deleted = w.csvfilename
-	os.remove(f_to_be_deleted)
+	os.remove(f_to_be_deleted+'.gz')
 
 	
 	
@@ -535,7 +535,7 @@ class ViewTest(TestCase):
 
 	w = Workout.objects.get(id=1)
 	f_to_be_deleted = w.csvfilename
-	os.remove(f_to_be_deleted)
+	os.remove(f_to_be_deleted+'.gz')
 
 
 	
@@ -580,7 +580,7 @@ class ViewTest(TestCase):
 	self.assertEqual(response.status_code, 200)
 	w = Workout.objects.get(id=1)
 	f_to_be_deleted = w.csvfilename
-	os.remove(f_to_be_deleted)
+	os.remove(f_to_be_deleted+'.gz')
 
     def test_upload_view_TCX_SpeedCoach2(self):
 	self.c.login(username='john',password='koeinsloot')
@@ -610,7 +610,7 @@ class ViewTest(TestCase):
 
 	w = Workout.objects.get(id=1)
 	f_to_be_deleted = w.csvfilename
-	os.remove(f_to_be_deleted)
+	os.remove(f_to_be_deleted+'.gz')
 
     def test_upload_view_TCX_SpeedCoach2(self):
 	self.c.login(username='john',password='koeinsloot')
@@ -640,7 +640,7 @@ class ViewTest(TestCase):
 
 	w = Workout.objects.get(id=1)
 	f_to_be_deleted = w.csvfilename
-	os.remove(f_to_be_deleted)
+	os.remove(f_to_be_deleted+'.gz')
 
 
 
@@ -672,7 +672,7 @@ class ViewTest(TestCase):
 
 	w = Workout.objects.get(id=1)
 	f_to_be_deleted = w.csvfilename
-	os.remove(f_to_be_deleted)
+	os.remove(f_to_be_deleted+'.gz')
 
     def test_upload_view_SpeedCoach2v127(self):
 	self.c.login(username='john',password='koeinsloot')
@@ -702,7 +702,7 @@ class ViewTest(TestCase):
 
 	w = Workout.objects.get(id=1)
 	f_to_be_deleted = w.csvfilename
-	os.remove(f_to_be_deleted)
+	os.remove(f_to_be_deleted+'.gz')
 
 
     def test_upload_view_SpeedCoach2v127intervals(self):
@@ -733,7 +733,7 @@ class ViewTest(TestCase):
 
 	w = Workout.objects.get(id=1)
 	f_to_be_deleted = w.csvfilename
-	os.remove(f_to_be_deleted)
+	os.remove(f_to_be_deleted+'.gz')
 
 
     def test_upload_view_TCX_NoHR(self):
@@ -764,7 +764,7 @@ class ViewTest(TestCase):
 
 	w = Workout.objects.get(id=1)
 	f_to_be_deleted = w.csvfilename
-	os.remove(f_to_be_deleted)
+	os.remove(f_to_be_deleted+'.gz')
 
     def test_upload_view_TCX_CN(self):
 	self.c.login(username='john',password='koeinsloot')
@@ -791,7 +791,7 @@ class ViewTest(TestCase):
 
 	w = Workout.objects.get(id=1)
 	f_to_be_deleted = w.csvfilename
-	os.remove(f_to_be_deleted)
+	os.remove(f_to_be_deleted+'.gz')
 
     def test_upload_view_RP(self):
 	self.c.login(username='john',password='koeinsloot')
@@ -818,7 +818,7 @@ class ViewTest(TestCase):
 	
 	w = Workout.objects.get(id=1)
 	f_to_be_deleted = w.csvfilename
-	os.remove(f_to_be_deleted)
+	os.remove(f_to_be_deleted+'.gz')
 
     def test_upload_view_Mystery(self):
 	self.c.login(username='john',password='koeinsloot')
@@ -845,7 +845,7 @@ class ViewTest(TestCase):
 	
 	w = Workout.objects.get(id=1)
 	f_to_be_deleted = w.csvfilename
-	os.remove(f_to_be_deleted)
+	os.remove(f_to_be_deleted+'.gz')
 
     def test_upload_view_RP_interval(self):
 	self.c.login(username='john',password='koeinsloot')
@@ -872,7 +872,7 @@ class ViewTest(TestCase):
 	
 	w = Workout.objects.get(id=1)
 	f_to_be_deleted = w.csvfilename
-	os.remove(f_to_be_deleted)
+	os.remove(f_to_be_deleted+'.gz')
 
     def test_upload_view_sled_desktop(self):
 	self.c.login(username='john',password='koeinsloot')
@@ -899,7 +899,7 @@ class ViewTest(TestCase):
 	
 	w = Workout.objects.get(id=1)
 	f_to_be_deleted = w.csvfilename
-	os.remove(f_to_be_deleted)
+	os.remove(f_to_be_deleted+'.gz')
 
     def test_upload_view_sled_ergdata(self):
 	self.c.login(username='john',password='koeinsloot')
@@ -926,7 +926,7 @@ class ViewTest(TestCase):
 	
 	w = Workout.objects.get(id=1)
 	f_to_be_deleted = w.csvfilename
-	os.remove(f_to_be_deleted)
+	os.remove(f_to_be_deleted+'.gz')
 
     def test_upload_view_sled_boatcoach(self):
 	self.c.login(username='john',password='koeinsloot')
@@ -953,7 +953,7 @@ class ViewTest(TestCase):
 	
 	w = Workout.objects.get(id=1)
 	f_to_be_deleted = w.csvfilename
-	os.remove(f_to_be_deleted)
+	os.remove(f_to_be_deleted+'.gz')
 
     def test_upload_view_sled_ergstick(self):
 	self.c.login(username='john',password='koeinsloot')
@@ -980,7 +980,7 @@ class ViewTest(TestCase):
 	
 	w = Workout.objects.get(id=1)
 	f_to_be_deleted = w.csvfilename
-	os.remove(f_to_be_deleted)
+	os.remove(f_to_be_deleted+'.gz')
 
 #    def test_upload_view_FIT_SpeedCoach2a(self):
 #	self.c.login(username='john',password='koeinsloot')
@@ -1013,7 +1013,7 @@ class ViewTest(TestCase):
 
 #	w = Workout.objects.get(id=1)
 #	f_to_be_deleted = w.csvfilename
-#	os.remove(f_to_be_deleted)
+#	os.remove(f_to_be_deleted+'.gz')
 
 class subroutinetests(TestCase):
     def setUp(self):
diff --git a/rowers/views.py b/rowers/views.py
index 107ae277..2c8af572 100644
--- a/rowers/views.py
+++ b/rowers/views.py
@@ -3710,7 +3710,10 @@ def workout_upload_view(request,message=""):
 		    row.write_csv(f2,gzip=True)
 
                     #os.remove(f2)
-		    os.remove(f_to_be_deleted)
+                    try:
+		        os.remove(f_to_be_deleted)
+                    except:
+                        os.remove(f_to_be_deleted+'.gz')
 
 		# make workout and put in database
 		r = Rower.objects.get(user=request.user)
@@ -3996,8 +3999,11 @@ def workout_upload_view_debug(request,message=""):
 		# should delete file
 		f2 = f2[:-4]+'o.csv'
 		row.write_csv(f2,gzip=True)
-		os.remove(f_to_be_deleted)
-                # remove uncompressed
+                try:
+		    os.remove(f_to_be_deleted)
+                except:
+                    os.remove(f_to_be_deleted+'.gz')
+                    # remove uncompressed
 
 	    # make workout and put in database
 	    r = Rower.objects.get(user=request.user)